diff --git a/source/enemy/neyeball.cpp b/source/enemy/neyeball.cpp index c6d5a4605..5af8d3492 100644 --- a/source/enemy/neyeball.cpp +++ b/source/enemy/neyeball.cpp @@ -105,6 +105,8 @@ bool CNpcEyeballEnemy::processSensor() void CNpcEyeballEnemy::processClose( int _frames ) { +CThing *Next=getNext(); + if ( Next ) { CProjectile *projectile; @@ -265,6 +267,7 @@ void CNpcEyeballEnemy::processShot( int _frames ) m_actorGfx->SetOtPos( 0 ); } + CThing *Next=getNext(); if ( Next ) { CProjectile *projectile; @@ -298,6 +301,7 @@ void CNpcEyeballEnemy::processShot( int _frames ) m_speed++; } + CThing *Next=getNext(); if ( Next ) { CProjectile *projectile; diff --git a/source/fx/fxjfish.cpp b/source/fx/fxjfish.cpp index 79219af53..2a18b05d8 100644 --- a/source/fx/fxjfish.cpp +++ b/source/fx/fxjfish.cpp @@ -40,7 +40,7 @@ void CFXJellyFishLegs::shutdown() /*****************************************************************************/ void CFXJellyFishLegs::SetUp(int _Width,int _Gap,int _Length,int _Count) { - +/* XOfs=-(_Width/2); Width=_Width/_Gap; Gap=_Gap; @@ -74,7 +74,7 @@ int AInc=1024/Width; HeightTable[H]=(s16)dH; // printf("%i %i =%i\n",H,Ofs,HeightTable[H]); } - +*/ } /*****************************************************************************/ @@ -84,7 +84,7 @@ int AInc=1024/Width; int XT[]={-3,-2,-2,-2,-2,-1,-1,-1, +1,+1,+1,+2,+2,+2,+2,+3}; void CFXJellyFishLegs::think(int _frames) { - ASSERT(FXList); +/* ASSERT(FXList); CFX::think(_frames); ListIdx--; @@ -100,6 +100,7 @@ void CFXJellyFishLegs::think(int _frames) ThisList[ListIdx].Ofs.vx+=XT[XO]; } +*/ } /*****************************************************************************/ @@ -111,6 +112,7 @@ int LY=32; void CFXJellyFishLegs::render() { +/* DVECTOR _MapOfs=CLevel::getCameraPos(); DVECTOR MapOfs; int dRGB=256/Count; @@ -160,4 +162,5 @@ s16 *dH=HeightTable; } MapOfs.vx+=Gap; } +*/ } diff --git a/source/fx/fxjfish.h b/source/fx/fxjfish.h index f87153849..8a671770f 100644 --- a/source/fx/fxjfish.h +++ b/source/fx/fxjfish.h @@ -22,7 +22,7 @@ virtual void think(int _frames); virtual void render(); void SetUp(int _Width,int _Gap,int _Length,int _Count); -virtual CRECT const &getCollisionArea() {return (Parent->getCollisionArea());} +//virtual CRECT const &getCollisionArea() {return (Parent->getCollisionArea());} protected: diff --git a/source/projectl/projectl.cpp b/source/projectl/projectl.cpp index 5566e60dd..27dd052f9 100644 --- a/source/projectl/projectl.cpp +++ b/source/projectl/projectl.cpp @@ -261,6 +261,7 @@ void CProjectile::think(int _frames) { if ( processTargetSeek( _frames, m_initPos ) ) { + CThing *Parent=getParent(); Parent->processEvent( PROJECTILE_RETURNED_TO_SOURCE_EVENT, this ); m_heading = m_initHeading; }