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:36:26 +00:00
parent d522c8bda5
commit dfa7354bb1
2 changed files with 48 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
source/enemy/npc.cpp
View file

@ -618,6 +618,7 @@ void CNpcEnemy::init()
m_isShuttingDown = false; m_isShuttingDown = false;
m_drawRotation = 0; m_drawRotation = 0;
m_isCaught = false; m_isCaught = false;
m_isBlowerOn = false;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -1506,6 +1507,45 @@ void CNpcEnemy::processCoralBlowerMovement( int _frames, s32 xDist, s32 yDist )
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
bool CNpcEnemy::suckUp( DVECTOR *suckPos )
{
m_isCaught = true;
m_isBlowerOn = true;
switch( m_state )
{
case NPC_CORAL_BLOWER_SUCK:
{
// go to user
s32 targetXDist = suckPos.vx - Pos.vx;
s32 targetYDist = suckPos.vy - Pos.vy;
processCoralBlowerMovement( _frames, targetXDist, targetYDist );
break;
}
case NPC_CORAL_BLOWER_RETURN:
{
m_state = NPC_CORAL_BLOWER_SUCK;
break;
}
default:
{
m_state = NPC_CORAL_BLOWER_SUCK;
m_oldState = m_state;
m_caughtPos = Pos;
break;
}
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcEnemy::processCoralBlower( int _frames ) void CNpcEnemy::processCoralBlower( int _frames )
{ {
s32 targetXDist, targetYDist; s32 targetXDist, targetYDist;
@ -1514,12 +1554,10 @@ void CNpcEnemy::processCoralBlower( int _frames )
{ {
case NPC_CORAL_BLOWER_SUCK: case NPC_CORAL_BLOWER_SUCK:
{ {
// go to user if ( !m_isBlowerOn )
{
targetXDist = playerXDist; m_state = NPC_CORAL_BLOWER_RETURN;
targetYDist = playerYDist; }
processCoralBlowerMovement( _frames, targetXDist, targetYDist );
break; break;
} }
@ -1551,4 +1589,6 @@ void CNpcEnemy::processCoralBlower( int _frames )
break; break;
} }
} }
m_isBlowerOn = false;
} }

2
source/enemy/npc.h
View file

@ -116,6 +116,7 @@ public:
void setToShutdown(); void setToShutdown();
u8 isSetToShutdown() {return( m_isShuttingDown );} u8 isSetToShutdown() {return( m_isShuttingDown );}
bool suckUp( DVECTOR *suckPos );
protected: protected:
class CLayerCollision *m_layerCollision; class CLayerCollision *m_layerCollision;
@ -290,6 +291,7 @@ protected:
s32 m_health; s32 m_health;
bool m_isActive; bool m_isActive;
u8 m_isCaught; u8 m_isCaught;
u8 m_isBlowerOn;
DVECTOR m_caughtPos; DVECTOR m_caughtPos;
s32 m_frame; s32 m_frame;