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-18 23:12:24 +00:00
parent f338710074
commit 63598d2f73
17 changed files with 363 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

49
source/enemy/npc.cpp
View file

@ -261,6 +261,7 @@ void CNpcEnemy::init()
m_timerFunc = m_data[this->m_type].timerFunc;
m_sensorFunc = m_data[this->m_type].sensorFunc;
m_movementFunc = m_data[this->m_type].movementFunc;
m_controlFunc = NPC_CONTROL_MOVEMENT;
@ -560,6 +561,23 @@ void CNpcEnemy::postInit()
break;
}
case NPC_INIT_SPIDER_CRAB:
{
m_npcPath.setPathType( CNpcPath::PONG_PATH );
if ( m_layerCollision->getHeightFromGround( Pos.vx, Pos.vy, 16 ) < 0 )
//if ( m_layerCollision->Get( Pos.vx >> 4, Pos.vy >> 4 ) )
{
// starting off below ground, jump initially
m_velocity = 5;
m_movementFunc = NPC_MOVEMENT_SPIDER_CRAB_INITJUMP;
}
break;
}
default:
break;
@ -590,6 +608,7 @@ void CNpcEnemy::reinit()
m_timerFunc = m_data[this->m_type].timerFunc;
m_sensorFunc = m_data[this->m_type].sensorFunc;
m_movementFunc = m_data[this->m_type].movementFunc;
m_controlFunc = NPC_CONTROL_MOVEMENT;
@ -623,18 +642,6 @@ void CNpcEnemy::shutdown()
delete m_actorGfx;
// remove child elements
CThing *List = this->getNext();
while ( List )
{
CThing *Next = List->getNext();
List->shutdown();
List = Next;
}
CEnemyThing::shutdown();
}
@ -1156,7 +1163,7 @@ void CNpcEnemy::processMovement(int _frames)
s32 moveVel = 0;
s32 moveDist = 0;
switch( m_data[this->m_type].movementFunc )
switch( m_movementFunc )
{
case NPC_MOVEMENT_STATIC:
{
@ -1280,6 +1287,20 @@ void CNpcEnemy::processMovement(int _frames)
break;
}
case NPC_MOVEMENT_SPIDER_CRAB_SPAWNER:
{
processSpiderCrabSpawnerMovement( _frames );
break;
}
case NPC_MOVEMENT_SPIDER_CRAB_INITJUMP:
{
processSpiderCrabInitJumpMovement( _frames );
break;
}
default:
break;
@ -1735,4 +1756,4 @@ void CNpcEnemy::caughtWithNet()
{
shutdown();
}
}
}