zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Paul 2001-05-25 19:44:11 +00:00
parent 217e8bfad2
commit 50061c15c2
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/DataCache.scr
View file

@ -159,6 +159,7 @@ actors/SPONGEBOB.SBK
actors/SPONGEBOB_CORALBLOWER.SBK actors/SPONGEBOB_CORALBLOWER.SBK
actors/SPONGEBOB_JELLYLAUNCHER.SBK actors/SPONGEBOB_JELLYLAUNCHER.SBK
actors/SPONGEBOB_NET.SBK actors/SPONGEBOB_NET.SBK
actors/SPONGEBOB_WAND.SBK
actors/SPONGEBOB_JELLYFISH.SBK actors/SPONGEBOB_JELLYFISH.SBK
actors/SPONGEBOB_GLASSES.SBK actors/SPONGEBOB_GLASSES.SBK
actors/SPONGEBOB_GLOVE.SBK actors/SPONGEBOB_GLOVE.SBK

4
makefile.gfx
View file

@ -107,7 +107,7 @@ ACTOR_OUT_DIR := $(DATA_OUT)/Actors
ACTOR_MAKEFILE_DIR := $(TEMP_BUILD_DIR)/actor ACTOR_MAKEFILE_DIR := $(TEMP_BUILD_DIR)/actor
ACTOR_DIRS_TO_MAKE := $(ACTOR_MAKEFILE_DIR) $(ACTOR_OUT_DIR) ACTOR_DIRS_TO_MAKE := $(ACTOR_MAKEFILE_DIR) $(ACTOR_OUT_DIR)
ACTOR_SPONGEBOB := SpongeBob SpongeBob_CoralBlower SpongeBob_JellyLauncher SpongeBob_Net SpongeBob_Glove SpongeBob_Glasses SpongeBob_JellyFish ACTOR_SPONGEBOB := SpongeBob SpongeBob_CoralBlower SpongeBob_JellyLauncher SpongeBob_Net SpongeBob_Glove SpongeBob_Wand SpongeBob_Glasses SpongeBob_JellyFish
ACTOR_NPC := BarnacleBoy Krusty Squidward Gary Sandy Patrick MermaidMan ACTOR_NPC := BarnacleBoy Krusty Squidward Gary Sandy Patrick MermaidMan
ACTOR_ENEMY := Anenome BabyOctopus Ballblob Caterpillar clam Dustdevil \ ACTOR_ENEMY := Anenome BabyOctopus Ballblob Caterpillar clam Dustdevil \
@ -180,7 +180,7 @@ INGAMEFX_GFX_NONTRANS_IN := $(foreach FILE,$(INGAMEFX_GFX_NONTRANS),$(INGAMEFX_N
PICKUP_GFX_DIR := $(GRAF_DIR)/pickups PICKUP_GFX_DIR := $(GRAF_DIR)/pickups
PICKUP_GFX := +spatula +pants +health100 +health50 +health25 +glint1 +glint2 +glint3 +glint4 \ PICKUP_GFX := +spatula +pants +health100 +health50 +health25 +glint1 +glint2 +glint3 +glint4 \
+jellyammo +bubblemixture +bubblewand +glasses +shoe +balloon +helmet \ +jellyammo +bubblemixture +bubblewand +glasses +shoe +balloon +balloonburst +helmet \
+blower +launcher +net \ +blower +launcher +net \
+c1_l1_jelly +c1_l2_seaweed +c1_l3_seanutbutter +c1_l4_breadslice \ +c1_l1_jelly +c1_l2_seaweed +c1_l3_seanutbutter +c1_l4_breadslice \
+c2_l1_falseteeth +c2_l2_kelpkream +c2_l3_mudpack +c2_l4_sponge \ +c2_l1_falseteeth +c2_l2_kelpkream +c2_l3_mudpack +c2_l4_sponge \

7
source/gui/gui.cpp
View file

@ -370,7 +370,7 @@ void CGUIObjectWithSpriteBank::shutdown()
CGUIObject::shutdown(); CGUIObject::shutdown();
m_spriteBank->dump(); m_spriteBank->dump();
// delete m_spriteBank; delete m_spriteBank;
m_spriteBank=0; m_spriteBank=0;
} }
@ -383,9 +383,8 @@ void CGUIObjectWithSpriteBank::shutdown()
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CGUIObjectWithSpriteBank::setSpriteBank(FileEquate _fe) void CGUIObjectWithSpriteBank::setSpriteBank(FileEquate _fe)
{ {
// m_spriteBank=new ("spritebank") SpriteBank(); m_spriteBank=new ("spritebank") SpriteBank();
// m_spriteBank->load(_fe); m_spriteBank->load(_fe);
m_spriteBank=CGameScene::getSpriteBank();
} }