zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-04-30 15:42:07 +00:00
parent dfa7354bb1
commit beaf9a1f5d
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/enemy/npc.cpp
View file

@ -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_isCaught = true;
m_isBlowerOn = true; m_isBlowerOn = true;
@ -1518,8 +1518,8 @@ bool CNpcEnemy::suckUp( DVECTOR *suckPos )
{ {
// go to user // go to user
s32 targetXDist = suckPos.vx - Pos.vx; s32 targetXDist = suckPos->vx - Pos.vx;
s32 targetYDist = suckPos.vy - Pos.vy; s32 targetYDist = suckPos->vy - Pos.vy;
processCoralBlowerMovement( _frames, targetXDist, targetYDist ); processCoralBlowerMovement( _frames, targetXDist, targetYDist );
@ -1542,6 +1542,8 @@ bool CNpcEnemy::suckUp( DVECTOR *suckPos )
break; break;
} }
} }
return( false );
} }
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

2
source/enemy/npc.h
View file

@ -116,7 +116,7 @@ public:
void setToShutdown(); void setToShutdown();
u8 isSetToShutdown() {return( m_isShuttingDown );} u8 isSetToShutdown() {return( m_isShuttingDown );}
bool suckUp( DVECTOR *suckPos ); bool suckUp( DVECTOR *suckPos, int _frames );
protected: protected:
class CLayerCollision *m_layerCollision; class CLayerCollision *m_layerCollision;