diff --git a/data/DataCache.scr b/data/DataCache.scr index d8d14383e..33b4f95c2 100644 --- a/data/DataCache.scr +++ b/data/DataCache.scr @@ -189,7 +189,6 @@ actors/SKELETALFISH.SBK actors/SPIDERCRAB.SBK actors/SPIKEYANENOME.SBK actors/STOMPER.SBK -actors/SHELL.SBK actors/SHARKSUB.SBK actors/MOTHERJELLYFISH.SBK diff --git a/makefile.gaz b/makefile.gaz index cc8ebacdd..4602c6623 100644 --- a/makefile.gaz +++ b/makefile.gaz @@ -84,7 +84,8 @@ enemy_src := npc \ nmjback \ nsjback \ nsj2back \ - nbuttfly + nbuttfly \ + nshell friend_src := friend \ fdata \ diff --git a/makefile.gfx b/makefile.gfx index 4382ad014..f0655ee18 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -113,11 +113,11 @@ ACTOR_NPC := BarnacleBoy Krusty Squidward Gary Sandy Patrick MermaidMan ACTOR_ENEMY := Anenome BabyOctopus Ballblob Caterpillar clam Dustdevil Eyeball \ Flamingskull FlyingDutchman Ghost HermitCrab IronDogFish Lrgjellyfish \ PuffaFish Sharkman Skeletalfish SpiderCrab SpikeyAnenome Stomper \ - SharkSub Motherjellyfish SeaSnake Shell + SharkSub Motherjellyfish SeaSnake # Boogermonster GiantWorm Jellyfish2 Motherjellyfish Nautilus Neptune SeaSnake SharkSub -ACTOR_SPRITES := Jellyfish1 Squiddart Plankton Butterfly +ACTOR_SPRITES := Jellyfish1 Squiddart Plankton Butterfly Shell ACTOR_SPR_LIST := $(foreach ACTOR,$(ACTOR_SPRITES), $(ACTOR_IN_DIR)/$(ACTOR)/$(ACTOR_SPRITE_DIR)/$(ACTOR)_*.bmp) ACTOR_SPR_DEP := $(foreach ACTOR,$(ACTOR_SPRITES), $(ACTOR_IN_DIR)/$(ACTOR)/$(ACTOR_SPRITE_DIR)/*) diff --git a/source/enemy/npcdata.cpp b/source/enemy/npcdata.cpp index 2e52cdf3a..0fe4efa54 100644 --- a/source/enemy/npcdata.cpp +++ b/source/enemy/npcdata.cpp @@ -965,7 +965,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = }, { // NPC_SHELL - ACTORS_SHELL_SBK, + 0,//ACTORS_SHELL_SBK, 0, NPC_SENSOR_NONE, NPC_MOVEMENT_STATIC, diff --git a/source/enemy/nshell.h b/source/enemy/nshell.h index 3538eb552..e5ac97005 100644 --- a/source/enemy/nshell.h +++ b/source/enemy/nshell.h @@ -14,8 +14,15 @@ #ifndef __ENEMY_NSHELL_H__ #define __ENEMY_NSHELL_H__ +#ifndef __ENEMY_NPC_H__ +#include "enemy\npc.h" +#endif + class CNpcShellEnemy : public CNpcEnemy { +public: + virtual void render(); + virtual int getFrameCount() {return( 1 );} }; #endif diff --git a/source/game/pause.cpp b/source/game/pause.cpp index ec111e6e8..2a286f8b6 100644 --- a/source/game/pause.cpp +++ b/source/game/pause.cpp @@ -98,7 +98,7 @@ void CPauseMenu::init() int xpos=TEXT_SPACING/2; -#ifdef __USER_paul__ +#if defined (__USER_paul__) || defined (__USER_charles__) CGUIFactory::createValueButtonFrame(m_guiFrame, (FRAME_WIDTH-TEXT_BOX_WIDTH)/2,xpos,TEXT_BOX_WIDTH,TEXT_BOX_HEIGHT, STR__PAUSE_MENU__CONTINUE, diff --git a/source/player/pmcoral.cpp b/source/player/pmcoral.cpp index f706ff2cb..6656c3109 100644 --- a/source/player/pmcoral.cpp +++ b/source/player/pmcoral.cpp @@ -66,8 +66,8 @@ #include "game\game.h" #endif -#ifndef __PROJECTL_PRNPC_H__ -#include "projectl\prnpc.h" +#ifndef __PROJECTL_PRNPCSPR_H__ +#include "projectl\prnpcspr.h" #endif #ifndef __GFX_FONT_H__ @@ -264,8 +264,8 @@ void CPlayerModeCoralBlower::think() newPos.vy -= 10; - CEnemyAsProjectile *projectile; - projectile = new( "blower projectile" ) CEnemyAsProjectile; + CEnemyAsSpriteProjectile *projectile; + projectile = new( "blower projectile" ) CEnemyAsSpriteProjectile; projectile->init( newPos, 1024+(1024*m_player->getFacing()), CPlayerProjectile::PLAYER_PROJECTILE_DUMBFIRE, @@ -273,9 +273,11 @@ void CPlayerModeCoralBlower::think() 5*60); projectile->setLayerCollision( m_player->getLayerCollision() ); - CActorGfx *projectileGfx; - projectileGfx=CActorPool::GetActor((FileEquate)ACTORS_SHELL_SBK); - projectile->setGraphic( projectileGfx ); + //CActorGfx *projectileGfx; + //projectileGfx=CActorPool::GetActor((FileEquate)ACTORS_SHELL_SBK); + //projectile->setGraphic( projectileGfx ); + projectile->setGraphic( FRM_SHELL_STATIC0000 ); + projectile->setHasRGB( false ); } break; } diff --git a/source/projectl/prnpcspr.cpp b/source/projectl/prnpcspr.cpp index 4c86b5ba3..5d5f2f4ae 100644 --- a/source/projectl/prnpcspr.cpp +++ b/source/projectl/prnpcspr.cpp @@ -34,6 +34,7 @@ void CEnemyAsSpriteProjectile::think( int _frames ) void CEnemyAsSpriteProjectile::setGraphic( int frame ) { m_spriteFrame = frame; + m_rotation = 0; } void CEnemyAsSpriteProjectile::setRGB( int R, int G, int B ) diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp index 549c91967..83ed8eaa7 100644 --- a/users/paul/spongebob project/spongebob project.dsp +++ b/users/paul/spongebob project/spongebob project.dsp @@ -325,6 +325,10 @@ SOURCE=..\..\..\source\enemy\nsdart.h # End Source File # Begin Source File +SOURCE=..\..\..\source\enemy\nshell.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\source\enemy\nshell.h # End Source File # Begin Source File