diff --git a/source/enemy/npc.cpp b/source/enemy/npc.cpp index 601464c92..4f5a2aa16 100644 --- a/source/enemy/npc.cpp +++ b/source/enemy/npc.cpp @@ -1507,7 +1507,7 @@ void CNpcEnemy::processCoralBlowerMovement( int _frames, s32 xDist, s32 yDist ) //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -bool CNpcEnemy::suckUp( DVECTOR *suckPos ) +bool CNpcEnemy::suckUp( DVECTOR *suckPos, int _frames ) { m_isCaught = true; m_isBlowerOn = true; @@ -1518,8 +1518,8 @@ bool CNpcEnemy::suckUp( DVECTOR *suckPos ) { // go to user - s32 targetXDist = suckPos.vx - Pos.vx; - s32 targetYDist = suckPos.vy - Pos.vy; + s32 targetXDist = suckPos->vx - Pos.vx; + s32 targetYDist = suckPos->vy - Pos.vy; processCoralBlowerMovement( _frames, targetXDist, targetYDist ); @@ -1542,6 +1542,8 @@ bool CNpcEnemy::suckUp( DVECTOR *suckPos ) break; } } + + return( false ); } //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/source/enemy/npc.h b/source/enemy/npc.h index 12669e317..c84f190fa 100644 --- a/source/enemy/npc.h +++ b/source/enemy/npc.h @@ -116,7 +116,7 @@ public: void setToShutdown(); u8 isSetToShutdown() {return( m_isShuttingDown );} - bool suckUp( DVECTOR *suckPos ); + bool suckUp( DVECTOR *suckPos, int _frames ); protected: class CLayerCollision *m_layerCollision;