diff --git a/makefile.gaz b/makefile.gaz index 1af25693b..d2322c9fd 100644 --- a/makefile.gaz +++ b/makefile.gaz @@ -74,6 +74,7 @@ enemy_src := 2denemy \ nocto \ nfskull \ nsklfish \ + ngary \ enemy projectl_src := projectl diff --git a/source/enemy/ngary.cpp b/source/enemy/ngary.cpp new file mode 100644 index 000000000..ff3b7751e --- /dev/null +++ b/source/enemy/ngary.cpp @@ -0,0 +1,21 @@ +/*========================================================================= + + ngary.cpp + + Author: CRB + Created: + Project: Spongebob + Purpose: + + Copyright (c) 2000 Climax Development Ltd + +===========================================================================*/ + +#ifndef __ENEMY_NPC_H__ +#include "enemy\npc.h" +#endif + + +void CNpc::processGaryMovement( int _frames ) +{ +} \ No newline at end of file diff --git a/source/enemy/npc.cpp b/source/enemy/npc.cpp index 770915b36..003973500 100644 --- a/source/enemy/npc.cpp +++ b/source/enemy/npc.cpp @@ -798,6 +798,13 @@ void CNpc::processMovement(int _frames) break; } + case NPC_MOVEMENT_GARY: + { + processGaryMovement( _frames ); + } + + break; + default: break; diff --git a/source/enemy/npc.h b/source/enemy/npc.h index 6f8b2c9c8..aa832d2fc 100644 --- a/source/enemy/npc.h +++ b/source/enemy/npc.h @@ -34,7 +34,8 @@ public: enum NPC_UNIT_TYPE { NPC_SANDY_CHEEKS = 0, - NPC_FALLING_ITEM = 1, + NPC_GARY = 1, + NPC_FALLING_ITEM, NPC_FISH_HOOK, NPC_DUST_DEVIL, NPC_PENDULUM, @@ -173,6 +174,7 @@ protected: NPC_MOVEMENT_FIREBALL, NPC_MOVEMENT_RETURNING_HAZARD, NPC_MOVEMENT_CLAM_RETRACT, + NPC_MOVEMENT_GARY, }; enum NPC_MOVEMENT_MODIFIER_FUNC @@ -354,6 +356,10 @@ protected: void processFireballMovement( int _frames ); void processReturningHazardMovement( int _frames ); + // gary functions + + void processGaryMovement( int _frames ); + // data static NPC_DATA m_data[NPC_UNIT_TYPE_MAX]; diff --git a/source/enemy/npcdata.cpp b/source/enemy/npcdata.cpp index 85f012da8..5a4f25482 100644 --- a/source/enemy/npcdata.cpp +++ b/source/enemy/npcdata.cpp @@ -36,6 +36,20 @@ CNpc::NPC_DATA CNpc::m_data[NPC_UNIT_TYPE_MAX] = DAMAGE__LAVA, }, + { // NPC_GARY + NPC_INIT_DEFAULT, + NPC_SENSOR_NONE, + NPC_MOVEMENT_GARY, + NPC_MOVEMENT_MODIFIER_NONE, + NPC_CLOSE_NONE, + NPC_TIMER_NONE, + false, + 3, + 2048, + false, + DAMAGE__LAVA, + }, + { // NPC_FALLING_ITEM NPC_INIT_FALLING_ITEM, NPC_SENSOR_FALLING_ITEM_USER_CLOSE, diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp index 02d6b0d3b..e12b08997 100644 --- a/users/paul/spongebob project/spongebob project.dsp +++ b/users/paul/spongebob project/spongebob project.dsp @@ -157,6 +157,10 @@ SOURCE=..\..\..\source\enemy\nfskull.cpp # End Source File # Begin Source File +SOURCE=..\..\..\source\enemy\ngary.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\source\enemy\ngeneric.cpp # End Source File # Begin Source File