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-05-09 20:46:22 +00:00
parent 0dcd0ddb68
commit 3ae08ab458
4 changed files with 47 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
source/enemy/npc.cpp
View file

@ -717,8 +717,6 @@ void CNpcEnemy::setToShutdown()
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
bool gitTrigger = false;
int CNpcEnemy::getFrameCount() int CNpcEnemy::getFrameCount()
{ {
return( m_actorGfx->getFrameCount( m_animNo ) ); return( m_actorGfx->getFrameCount( m_animNo ) );
@ -825,11 +823,6 @@ void CNpcEnemy::think(int _frames)
{ {
processTimer( moveFrames ); processTimer( moveFrames );
} }
if ( gitTrigger )
{
fireAsProjectile( 0 );
}
} }
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -1453,7 +1446,7 @@ void CNpcEnemy::processEnemyCollision( CThing *thisThing )
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
bool CNpcEnemy::processCoralBlowerMovement( int _frames, s32 xDist, s32 yDist ) bool CNpcEnemy::processCoralBlowerMovement( int _frames, s32 xDist, s32 yDist, u8 destroyAtTarget )
{ {
s32 moveX, moveY; s32 moveX, moveY;
s16 headingToTarget; s16 headingToTarget;
@ -1522,6 +1515,27 @@ bool CNpcEnemy::processCoralBlowerMovement( int _frames, s32 xDist, s32 yDist )
} }
else else
{ {
// has reached target point
if ( destroyAtTarget )
{
if ( m_data[m_type].respawning )
{
if ( m_isActive )
{
m_isCaught = false;
m_isActive = false;
m_timerFunc = NPC_TIMER_RESPAWN;
m_timerTimer = 1 * GameState::getOneSecondInFrames();
}
}
else
{
setToShutdown();
}
}
return( true ); return( true );
} }
} }
@ -1551,7 +1565,7 @@ bool CNpcEnemy::suckUp( DVECTOR *suckPos, int _frames )
s32 targetXDist = suckPos->vx - Pos.vx; s32 targetXDist = suckPos->vx - Pos.vx;
s32 targetYDist = suckPos->vy - Pos.vy; s32 targetYDist = suckPos->vy - Pos.vy;
returnVal = processCoralBlowerMovement( _frames, targetXDist, targetYDist ); returnVal = processCoralBlowerMovement( _frames, targetXDist, targetYDist, true );
break; break;
} }
@ -1601,7 +1615,7 @@ void CNpcEnemy::processCoralBlower( int _frames )
targetXDist = m_caughtPos.vx - Pos.vx; targetXDist = m_caughtPos.vx - Pos.vx;
targetYDist = m_caughtPos.vy - Pos.vy; targetYDist = m_caughtPos.vy - Pos.vy;
processCoralBlowerMovement( _frames, targetXDist, targetYDist ); processCoralBlowerMovement( _frames, targetXDist, targetYDist, false );
if ( !targetXDist && !targetYDist ) if ( !targetXDist && !targetYDist )
{ {
@ -1624,25 +1638,3 @@ void CNpcEnemy::processCoralBlower( int _frames )
m_isBlowerOn = false; m_isBlowerOn = false;
} }
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcEnemy::fireAsProjectile( s16 heading )
{
m_isActive = false;
setToShutdown();
DVECTOR newPos = Pos;
newPos.vy -= 10;
CEnemyAsProjectile *projectile;
projectile = new( "blower projectile" ) CEnemyAsProjectile;
projectile->init( newPos,
heading,
CPlayerProjectile::PLAYER_PROJECTILE_DUMBFIRE,
CPlayerProjectile::PLAYER_PROJECTILE_FINITE_LIFE,
5*60);
projectile->setLayerCollision( m_layerCollision );
projectile->setGraphic( m_actorGfx );
}

3
source/enemy/npc.h
View file

@ -116,7 +116,6 @@ public:
bool canBeSuckedUp(); bool canBeSuckedUp();
bool suckUp( DVECTOR *suckPos, int _frames ); bool suckUp( DVECTOR *suckPos, int _frames );
virtual void fireAsProjectile( s16 heading );
protected: protected:
class CLayerCollision *m_layerCollision; class CLayerCollision *m_layerCollision;
@ -253,7 +252,7 @@ protected:
void reinit(); void reinit();
void processCoralBlower( int _frames ); void processCoralBlower( int _frames );
bool processCoralBlowerMovement( int _frames, s32 xDist, s32 yDist ); bool processCoralBlowerMovement( int _frames, s32 xDist, s32 yDist, u8 destroyAtTarget );
// data // data

2
source/enemy/npcdata.cpp
View file

@ -946,7 +946,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
0, 0,
0, 0,
false, false,
false, true,
true, true,
}, },

24
source/player/pmcoral.cpp
View file

@ -58,6 +58,10 @@
#include "game\game.h" #include "game\game.h"
#endif #endif
#ifndef __PROJECTL_PRNPC_H__
#include "projectl\prnpc.h"
#endif
/* Std Lib /* Std Lib
------- */ ------- */
@ -221,14 +225,12 @@ void CPlayerModeCoralBlower::think()
} }
break; break;
case BLOWER_STATE__FULL: case BLOWER_STATE__FULL:
m_enemy->suckUp(getSuckUpPoint(),1);
if(getPadInputDown()&PI_ACTION&&getState()==STATE_IDLE) if(getPadInputDown()&PI_ACTION&&getState()==STATE_IDLE)
{ {
m_blowerState=BLOWER_STATE__AIMING; m_blowerState=BLOWER_STATE__AIMING;
} }
break; break;
case BLOWER_STATE__AIMING: case BLOWER_STATE__AIMING:
m_enemy->suckUp(getSuckUpPoint(),1);
if(getState()!=STATE_IDLE) if(getState()!=STATE_IDLE)
{ {
m_blowerState=BLOWER_STATE__FULL; m_blowerState=BLOWER_STATE__FULL;
@ -237,7 +239,23 @@ void CPlayerModeCoralBlower::think()
{ {
// Fire! // Fire!
m_blowerState=BLOWER_STATE__EMPTY; m_blowerState=BLOWER_STATE__EMPTY;
m_enemy->fireAsProjectile(1024+(1024*m_player->getFacing()));
DVECTOR newPos = m_player->getPos();
newPos.vy -= 10;
CEnemyAsProjectile *projectile;
projectile = new( "blower projectile" ) CEnemyAsProjectile;
projectile->init( newPos,
1024+(1024*m_player->getFacing()),
CPlayerProjectile::PLAYER_PROJECTILE_DUMBFIRE,
CPlayerProjectile::PLAYER_PROJECTILE_FINITE_LIFE,
5*60);
projectile->setLayerCollision( m_player->getLayerCollision() );
CActorGfx *projectileGfx;
projectileGfx=CActorPool::GetActor((FileEquate)ACTORS_SHELL_SBK);
projectile->setGraphic( projectileGfx );
} }
break; break;
} }