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-05-16 19:45:43 +00:00
parent dba18ce77c
commit 320876b044
9 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/DataCache.scr
View file

@ -189,7 +189,6 @@ actors/SKELETALFISH.SBK
actors/SPIDERCRAB.SBK actors/SPIDERCRAB.SBK
actors/SPIKEYANENOME.SBK actors/SPIKEYANENOME.SBK
actors/STOMPER.SBK actors/STOMPER.SBK
actors/SHELL.SBK
actors/SHARKSUB.SBK actors/SHARKSUB.SBK
actors/MOTHERJELLYFISH.SBK actors/MOTHERJELLYFISH.SBK

3
makefile.gaz
View file

@ -84,7 +84,8 @@ enemy_src := npc \
nmjback \ nmjback \
nsjback \ nsjback \
nsj2back \ nsj2back \
nbuttfly nbuttfly \
nshell
friend_src := friend \ friend_src := friend \
fdata \ fdata \

4
makefile.gfx
View file

@ -113,11 +113,11 @@ ACTOR_NPC := BarnacleBoy Krusty Squidward Gary Sandy Patrick MermaidMan
ACTOR_ENEMY := Anenome BabyOctopus Ballblob Caterpillar clam Dustdevil Eyeball \ ACTOR_ENEMY := Anenome BabyOctopus Ballblob Caterpillar clam Dustdevil Eyeball \
Flamingskull FlyingDutchman Ghost HermitCrab IronDogFish Lrgjellyfish \ Flamingskull FlyingDutchman Ghost HermitCrab IronDogFish Lrgjellyfish \
PuffaFish Sharkman Skeletalfish SpiderCrab SpikeyAnenome Stomper \ PuffaFish Sharkman Skeletalfish SpiderCrab SpikeyAnenome Stomper \
SharkSub Motherjellyfish SeaSnake Shell SharkSub Motherjellyfish SeaSnake
# Boogermonster GiantWorm Jellyfish2 Motherjellyfish Nautilus Neptune SeaSnake SharkSub # 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_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)/*) ACTOR_SPR_DEP := $(foreach ACTOR,$(ACTOR_SPRITES), $(ACTOR_IN_DIR)/$(ACTOR)/$(ACTOR_SPRITE_DIR)/*)

2
source/enemy/npcdata.cpp
View file

@ -965,7 +965,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
}, },
{ // NPC_SHELL { // NPC_SHELL
ACTORS_SHELL_SBK, 0,//ACTORS_SHELL_SBK,
0, 0,
NPC_SENSOR_NONE, NPC_SENSOR_NONE,
NPC_MOVEMENT_STATIC, NPC_MOVEMENT_STATIC,

7
source/enemy/nshell.h
View file

@ -14,8 +14,15 @@
#ifndef __ENEMY_NSHELL_H__ #ifndef __ENEMY_NSHELL_H__
#define __ENEMY_NSHELL_H__ #define __ENEMY_NSHELL_H__
#ifndef __ENEMY_NPC_H__
#include "enemy\npc.h"
#endif
class CNpcShellEnemy : public CNpcEnemy class CNpcShellEnemy : public CNpcEnemy
{ {
public:
virtual void render();
virtual int getFrameCount() {return( 1 );}
}; };
#endif #endif

2
source/game/pause.cpp
View file

@ -98,7 +98,7 @@ void CPauseMenu::init()
int xpos=TEXT_SPACING/2; int xpos=TEXT_SPACING/2;
#ifdef __USER_paul__ #if defined (__USER_paul__) || defined (__USER_charles__)
CGUIFactory::createValueButtonFrame(m_guiFrame, CGUIFactory::createValueButtonFrame(m_guiFrame,
(FRAME_WIDTH-TEXT_BOX_WIDTH)/2,xpos,TEXT_BOX_WIDTH,TEXT_BOX_HEIGHT, (FRAME_WIDTH-TEXT_BOX_WIDTH)/2,xpos,TEXT_BOX_WIDTH,TEXT_BOX_HEIGHT,
STR__PAUSE_MENU__CONTINUE, STR__PAUSE_MENU__CONTINUE,

16
source/player/pmcoral.cpp
View file

@ -66,8 +66,8 @@
#include "game\game.h" #include "game\game.h"
#endif #endif
#ifndef __PROJECTL_PRNPC_H__ #ifndef __PROJECTL_PRNPCSPR_H__
#include "projectl\prnpc.h" #include "projectl\prnpcspr.h"
#endif #endif
#ifndef __GFX_FONT_H__ #ifndef __GFX_FONT_H__
@ -264,8 +264,8 @@ void CPlayerModeCoralBlower::think()
newPos.vy -= 10; newPos.vy -= 10;
CEnemyAsProjectile *projectile; CEnemyAsSpriteProjectile *projectile;
projectile = new( "blower projectile" ) CEnemyAsProjectile; projectile = new( "blower projectile" ) CEnemyAsSpriteProjectile;
projectile->init( newPos, projectile->init( newPos,
1024+(1024*m_player->getFacing()), 1024+(1024*m_player->getFacing()),
CPlayerProjectile::PLAYER_PROJECTILE_DUMBFIRE, CPlayerProjectile::PLAYER_PROJECTILE_DUMBFIRE,
@ -273,9 +273,11 @@ void CPlayerModeCoralBlower::think()
5*60); 5*60);
projectile->setLayerCollision( m_player->getLayerCollision() ); projectile->setLayerCollision( m_player->getLayerCollision() );
CActorGfx *projectileGfx; //CActorGfx *projectileGfx;
projectileGfx=CActorPool::GetActor((FileEquate)ACTORS_SHELL_SBK); //projectileGfx=CActorPool::GetActor((FileEquate)ACTORS_SHELL_SBK);
projectile->setGraphic( projectileGfx ); //projectile->setGraphic( projectileGfx );
projectile->setGraphic( FRM_SHELL_STATIC0000 );
projectile->setHasRGB( false );
} }
break; break;
} }

1
source/projectl/prnpcspr.cpp
View file

@ -34,6 +34,7 @@ void CEnemyAsSpriteProjectile::think( int _frames )
void CEnemyAsSpriteProjectile::setGraphic( int frame ) void CEnemyAsSpriteProjectile::setGraphic( int frame )
{ {
m_spriteFrame = frame; m_spriteFrame = frame;
m_rotation = 0;
} }
void CEnemyAsSpriteProjectile::setRGB( int R, int G, int B ) void CEnemyAsSpriteProjectile::setRGB( int R, int G, int B )

4
users/paul/spongebob project/spongebob project.dsp
View file

@ -325,6 +325,10 @@ SOURCE=..\..\..\source\enemy\nsdart.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\..\source\enemy\nshell.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\source\enemy\nshell.h SOURCE=..\..\..\source\enemy\nshell.h
# End Source File # End Source File
# Begin Source File # Begin Source File