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-01-29 20:00:30 +00:00
parent da3fa8f6e9
commit 43a5a00b2a
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
source/enemy/npc.cpp
View file

@ -60,12 +60,12 @@ CNpc::NPC_DATA CNpc::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
}, },
{ // NPC_FALLING_ACORN { // NPC_FALLING_ITEM
NPC_INIT_FALLING_ACORN, NPC_INIT_FALLING_ITEM,
NPC_SENSOR_FALLING_ACORN_USER_CLOSE, NPC_SENSOR_FALLING_ITEM_USER_CLOSE,
NPC_MOVEMENT_STATIC, NPC_MOVEMENT_STATIC,
NPC_MOVEMENT_MODIFIER_NONE, NPC_MOVEMENT_MODIFIER_NONE,
NPC_CLOSE_FALLING_ACORN_FALL, NPC_CLOSE_FALLING_ITEM_FALL,
NPC_TIMER_NONE, NPC_TIMER_NONE,
false, false,
3, 3,
@ -516,7 +516,7 @@ void CNpc::init()
break; break;
case NPC_INIT_SKULL_STOMPER: case NPC_INIT_SKULL_STOMPER:
case NPC_INIT_FALLING_ACORN: case NPC_INIT_FALLING_ITEM:
{ {
m_heading = m_fireHeading = 1024; m_heading = m_fireHeading = 1024;
@ -866,7 +866,7 @@ bool CNpc::processSensor()
case NPC_SENSOR_ANEMONE_USER_CLOSE: case NPC_SENSOR_ANEMONE_USER_CLOSE:
case NPC_SENSOR_EYEBALL_USER_CLOSE: case NPC_SENSOR_EYEBALL_USER_CLOSE:
case NPC_SENSOR_FALLING_ACORN_USER_CLOSE: case NPC_SENSOR_FALLING_ITEM_USER_CLOSE:
{ {
if ( xDistSqr + yDistSqr < 40000 ) if ( xDistSqr + yDistSqr < 40000 )
{ {
@ -1197,8 +1197,8 @@ void CNpc::processClose(int _frames)
break; break;
case NPC_CLOSE_FALLING_ACORN_FALL: case NPC_CLOSE_FALLING_ITEM_FALL:
processCloseFallingAcornFall( _frames ); processCloseFallingItemFall( _frames );
break; break;

10
source/enemy/npc.h
View file

@ -30,7 +30,7 @@ public:
enum NPC_UNIT_TYPE enum NPC_UNIT_TYPE
{ {
NPC_SANDY_CHEEKS = 0, NPC_SANDY_CHEEKS = 0,
NPC_FALLING_ACORN = 1, NPC_FALLING_ITEM = 1,
NPC_FISH_HOOK, NPC_FISH_HOOK,
NPC_SMALL_JELLYFISH_1, NPC_SMALL_JELLYFISH_1,
NPC_SMALL_JELLYFISH_2, NPC_SMALL_JELLYFISH_2,
@ -87,7 +87,7 @@ protected:
NPC_INIT_SUB_SHARK, NPC_INIT_SUB_SHARK,
NPC_INIT_FLYING_DUTCHMAN, NPC_INIT_FLYING_DUTCHMAN,
NPC_INIT_IRON_DOGFISH, NPC_INIT_IRON_DOGFISH,
NPC_INIT_FALLING_ACORN, NPC_INIT_FALLING_ITEM,
NPC_INIT_FISH_HOOK, NPC_INIT_FISH_HOOK,
}; };
@ -115,7 +115,7 @@ protected:
NPC_SENSOR_SKULL_STOMPER_USER_CLOSE, NPC_SENSOR_SKULL_STOMPER_USER_CLOSE,
NPC_SENSOR_BOOGER_MONSTER_USER_CLOSE, NPC_SENSOR_BOOGER_MONSTER_USER_CLOSE,
NPC_SENSOR_IRON_DOGFISH_USER_CLOSE, NPC_SENSOR_IRON_DOGFISH_USER_CLOSE,
NPC_SENSOR_FALLING_ACORN_USER_CLOSE, NPC_SENSOR_FALLING_ITEM_USER_CLOSE,
NPC_SENSOR_FISH_HOOK_USER_CLOSE, NPC_SENSOR_FISH_HOOK_USER_CLOSE,
}; };
@ -137,7 +137,7 @@ protected:
NPC_CLOSE_SUB_SHARK_ATTACK, NPC_CLOSE_SUB_SHARK_ATTACK,
NPC_CLOSE_FLYING_DUTCHMAN_ATTACK, NPC_CLOSE_FLYING_DUTCHMAN_ATTACK,
NPC_CLOSE_IRON_DOGFISH_ATTACK, NPC_CLOSE_IRON_DOGFISH_ATTACK,
NPC_CLOSE_FALLING_ACORN_FALL, NPC_CLOSE_FALLING_ITEM_FALL,
NPC_CLOSE_FISH_HOOK_RISE, NPC_CLOSE_FISH_HOOK_RISE,
}; };
@ -297,7 +297,7 @@ protected:
// hazard functions // hazard functions
void processCloseFallingAcornFall( int _frames ); void processCloseFallingItemFall( int _frames );
void processCloseFishHookRise( int _frames ); void processCloseFishHookRise( int _frames );
// data // data