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-02-06 19:29:35 +00:00
parent 47cf9e3071
commit e0d7168d5c
6 changed files with 46 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
source/enemy/npc.cpp
View file

@ -48,7 +48,7 @@
void CNpc::init()
{
m_type = NPC_SMALL_JELLYFISH_1;
m_type = NPC_FLAMING_SKULL;
m_heading = m_fireHeading = 0;
m_movementTimer = 0;
@ -266,6 +266,13 @@ void CNpc::init()
break;
}
case NPC_FLAMING_SKULL:
{
m_state = FLAMING_SKULL_ATTACK;
break;
}
default:
break;
@ -539,6 +546,7 @@ bool CNpc::processSensor()
case NPC_SENSOR_ANEMONE_USER_CLOSE:
case NPC_SENSOR_EYEBALL_USER_CLOSE:
case NPC_SENSOR_FLAMING_SKULL_USER_CLOSE:
{
if ( xDistSqr + yDistSqr < 40000 )
{
@ -849,9 +857,14 @@ void CNpc::processClose(int _frames)
break;
case NPC_CLOSE_GENERIC_USER_SEEK:
processCloseGenericUserSeek( _frames );
{
s32 distX, distY;
processGenericGetUserDist( _frames, &distX, &distY );
processGenericGotoTarget( _frames, distX, distY, m_data[m_type].speed );
break;
}
case NPC_CLOSE_GHOST_PIRATE_ATTACK:
processCloseGhostPirateAttack( _frames );
@ -918,6 +931,11 @@ void CNpc::processClose(int _frames)
break;
case NPC_CLOSE_FLAMING_SKULL_ATTACK:
processCloseFlamingSkullAttack( _frames );
break;
default:
break;
}