data/DataCache.scr

@@ -1,3 +1,7 @@
+{ SYSTEM_CACHE 4
+}
+sprites/sprites.spr
+
 scripts/test.dat
 scripts/speechtest.dat
 translations/swe.dat
@@ -128,7 +132,4 @@ actors/SPIKEYANENOME.SBK
 actors/SQUIDDART.SBK
 actors/STOMPER.SBK
 
-{ SYSTEM_CACHE 4
-}
-frontend/frontend.spr
-ingamefx/ingamefx.spr
+

data/Scripts/test.scr

@@ -1,7 +1,7 @@
 #include	data/scripts/defs/defs.scr
 #include	data/scripts/defs/charanim.scr
 
-#include	out/usa/include/ingamefx.h
+#include	out/usa/include/sprites.h
 
 
 /*

makefile.gfx

@@ -109,11 +109,20 @@ ACTOR_DIRS_TO_MAKE :=	$(ACTOR_MAKEFILE_DIR) $(ACTOR_OUT_DIR)
 ACTOR_SPONGEBOB :=		SPONGEBOB
 ACTOR_NPC :=			
 #						BarnacleBoy Gary Krusty MermaidMan Patrick Plankton Sandy Squidward
+
 ACTOR_ENEMY :=			AnenomeLvl1 AnenomeLvl3 BabyOctopus Ballblob Caterpillar clam Dustdevil Eyeball \
-						Flamingskull FlyingDutchman Ghost HermitCrab IronDogFish Jellyfish1 Lrgjellyfish \
-						PuffaFish Sharkman Skeletalfish SpiderCrab SpikeyAnenome Squiddart Stomper
+						Flamingskull FlyingDutchman Ghost HermitCrab IronDogFish Lrgjellyfish \
+						PuffaFish Sharkman Skeletalfish SpiderCrab SpikeyAnenome Stomper \
+						Jellyfish1 Squiddart
+
 #						Boogermonster GiantWorm Jellyfish2 Motherjellyfish Nautilus Neptune SeaSnake SharkSub 
-#--- AnenomeLvl3 
+
+ACTOR_SPRITES :=		Jellyfish1 Squiddart
+
+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_IN :=			$(ACTOR_SPR_LIST)
+
 
 ACTOR_LIST :=			$(ACTOR_SPONGEBOB) $(ACTOR_NPC) $(ACTOR_ENEMY)
 
@@ -129,71 +138,24 @@ ACTOR_ALL_OUT :=		$(foreach ACTOR,$(ACTOR_LIST),$($(ACTOR)_OUT))
 GFX_DATA_OUT +=    		$(ACTOR_ALL_OUT)
 
 actors : $(ACTOR_ALL_OUT)
+	@$(ECHO) $(ACTOR_SPRITE_LIST)
 	@$(ECHO) Actors made
 
 cleanactors : 	
 	@$(RM) -f $(ACTOR_ALL_OUT)
 	@$(ECHO) Actors cleaned
 
+
 #----------------------------------------------------------------------------
 #----------------------------------------------------------------------------
-#	Text translations
+# Generic Sprite page
 #----------------------------------------------------------------------------
 #----------------------------------------------------------------------------
-.PHONY: translate cleantranslate
-
-LANGUAGES :=	swe \
-				dut \
-				ita \
-				ger
-
-
-TRANS_IN_DIR :=			$(GAME_DATA_DIR)/translations
-TRANS_OUT_DIR :=		$(DATA_OUT)/translations
-TRANS_LBM_OUT_DIR :=	$(REPORT_DIR)/translations
-
-TRANS_IN_ENG :=			$(TRANS_IN_DIR)/text.dat
-
-TRANS_FINAL_DAT_FILE :=	$(TRANS_OUT_DIR)/final.dat
-
-ALL_TRANS_OUT_DIRS :=	$(TRANS_OUT_DIR) \
-						$(TRANS_LBM_OUT_DIR)
-
-ALL_TRANS_IN_FILES :=	$(foreach FILE,$(LANGUAGES),$(TRANS_IN_DIR)/$(FILE).dat)
-
-TRANS_IN_FILES :=	$(TRANS_IN_ENG) $(ALL_TRANS_IN_FILES)
-
-TRANS_OUT_DAT :=	$(foreach FILE,	$(LANGUAGES),$(TRANS_OUT_DIR)/$(FILE).dat) $(TRANS_OUT_DIR)/id.dat $(TRANS_OUT_DIR)/eng.dat
-#$(TRANS_OUT_KANJI_TAB)
-TRANS_OUT_HDR :=	$(INC_DIR)/trans.h
-
-SCRIPT_TRANS_HDR :=	$(GAME_DATA_DIR)/scripts/defs/trans.scr
-
-TRANS_OUT_FILES :=	$(TRANS_OUT_HDR) $(TRANS_OUT_DAT) $(TRANS_OUT_LBM_LIST) $(TRANS_FINAL_DAT_FILE)
-
-$(TRANS_OUT_FILES) : $(TRANS_IN_FILES)
-	@perl tools/perl/pl/lang.pl $(TRANS_IN_ENG)  $(TRANS_FINAL_DAT_FILE) $(ALL_TRANS_IN_FILES)
-	@transtext $(LANG_OP) -h:$(TRANS_OUT_HDR) -o:$(TRANS_OUT_DIR) $(TRANS_FINAL_DAT_FILE)
-	@perl tools/perl/pl/text_extract.pl $(TRANS_OUT_HDR) $(SCRIPT_TRANS_HDR) STR__INGAME__
-
-translate : $(TRANS_OUT_FILES)
-	@$(ECHO) made translations
-
-cleantranslate:
-	@$(RM) -f $(TRANS_OUT_FILES)
-	@$(ECHO) Translations Cleaned
-
-GFX_DATA_OUT +=	$(TRANS_OUT_DAT)
-
 
 #----------------------------------------------------------------------------
 # Ingame graphics and UI
 #----------------------------------------------------------------------------
-INGAMEFX_GFX_DIR :=			$(GRAF_DIR)/ingamefx
-INGAMEFX_GFX_OUT_DIR :=		$(DATA_OUT)/ingamefx
-
-####
-
+INGAMEFX_GFX_NONTRANS_DIR :=$(GRAF_DIR)/ingamefx
 INGAMEFX_GFX_NONTRANS :=			
 INGAMEFX_GFX_NONTRANS_IN :=	$(foreach FILE,$(INGAMEFX_GFX_NONTRANS),$(INGAMEFX_NONTRANS_DIR)/$(FILE))
 
@@ -208,10 +170,12 @@ PICKUP_GFX :=				+spatula +pants +health100 +health50 +health25 +glint1 +glint2
 							+c5_l1_hammer +c5_l2_ariel +c5_l3_oilcan +c5_l4_wrench
 PICKUP_GFX_IN :=			$(foreach FILE,$(PICKUP_GFX),$(PICKUP_GFX_DIR)/$(FILE).bmp)
 
+INGAMEFX_GFX_DIR :=			$(GRAF_DIR)/ingamefx
 INGAMEFX_GFX_TRANS :=		+bubble_1 +bubble_2 +bubble_3 \
 							+health_full_1 +health_full_2 +health_full_3 +health_full_4 +health_full_5 \
 							+health_empty_1 +health_empty_2 +health_empty_3 +health_empty_4 +health_empty_5 \
 							+spike
+
 INGAMEFX_GFX_TRANS_IN :=	$(foreach FILE,$(INGAMEFX_GFX_TRANS),$(INGAMEFX_GFX_DIR)/$(FILE).bmp)
 
 ####
@@ -262,42 +226,19 @@ UI_GFX_TRANS_IN :=			$(foreach FILE,$(UI_GFX_TRANS),$(UI_GFX_DIR)/$(FILE))
 
 ####
 
-INGAMEFX_GFX_TEX_IN :=		${INGAMEFX_GFX_NONTRANS_IN} ${INGAMEFX_GFX_TRANS_IN} ${PICKUP_GFX_IN} \
-							${UI_GFX_FONT_IN} ${UI_GFX_NONTRANS_IN} ${UI_GFX_TRANS_IN}
-INGAMEFX_GFX_TEX_OUT :=		$(INGAMEFX_GFX_OUT_DIR)/ingamefx.Spr
-INGAMEFX_GFX_REP_FILE :=	$(REPORT_DIR)/ingamefx.rep
-INGAMEFX_GFX_HDR_FILE :=	$(INC_DIR)/ingamefx.h
-
-####
-
-cleaningamefx :
-		@$(RM) -f $(INGAMEFX_GFX_TEX_OUT)
-		@$(ECHO) InGame GFx Cleaned
-
-ingamefx:		$(INGAMEFX_GFX_TEX_IN)
-
-####
-
-$(INGAMEFX_GFX_TEX_OUT) :	$(INGAMEFX_GFX_TEX_IN)
-		@parkgrab	-c+ -z+ ${INGAMEFX_GFX_TRANS_IN} ${PICKUP_GFX_IN} \
-					-c- -z- ${INGAMEFX_GFX_NONTRANS_IN} -b+ \
-					-c+ -z+ $(UI_GFX_FONT_IN) ${UI_GFX_TRANS_IN} \
-					-c- -z- ${UI_GFX_NONTRANS_IN} \
-					-t:14,2,1 -l:$(REPORT_DIR)/ingamefx.lbm -o:$(INGAMEFX_GFX_TEX_OUT) -k:$(INGAMEFX_GFX_REP_FILE)
-		@$(MV) -f $(INGAMEFX_GFX_OUT_DIR)/ingamefx.h $(INGAMEFX_GFX_HDR_FILE)
-
-####
-
-GFX_DATA_OUT		+=	$(UI_GFX_TEX_OUT)
-GRAF_DIRS_TO_MAKE	+=	$(INGAMEFX_GFX_OUT_DIR)
-GFX_DATA_OUT		+=	$(INGAMEFX_GFX_TEX_OUT)
+INGAMEGFX_SPR_DEP :=		$(INGAMEFX_GFX_NONTRANS_IN) $(INGAMEFX_GFX_TRANS_IN) $(PICKUP_GFX_IN) \
+							$(UI_GFX_FONT_IN) $(UI_GFX_NONTRANS_IN) $(UI_GFX_TRANS_IN)
 
+INGAMEGFX_SPR_IN :=			-c+ -z+ $(INGAMEFX_GFX_TRANS_IN) $(PICKUP_GFX_IN) \
+							-c- -z- $(INGAMEFX_GFX_NONTRANS_IN) -b+ \
+							-c+ -z+ $(UI_GFX_FONT_IN) $(UI_GFX_TRANS_IN) \
+							-c- -z- $(UI_GFX_NONTRANS_IN) \
 
 #----------------------------------------------------------------------------
 # Front end graphics
 #----------------------------------------------------------------------------
 FRONTEND_GFX_DIR :=			$(GRAF_DIR)/frontend
-FRONTEND_GFX_OUT_DIR :=		$(DATA_OUT)/frontend
+# FRONTEND_GFX_OUT_DIR :=		$(DATA_OUT)/frontend
 
 FRONTEND_GFX_NONTRANS :=	sky.bmp
 FRONTEND_GFX_NONTRANS_IN :=	$(foreach FILE,$(FRONTEND_GFX_NONTRANS),$(FRONTEND_GFX_DIR)/$(FILE))
@@ -308,24 +249,106 @@ FRONTEND_GFX_TRANS_IN :=	$(foreach FILE,$(FRONTEND_GFX_TRANS),$(FRONTEND_GFX_DIR
 FRONTEND_GFX_TRANS_NO_ROT :=		+island.bmp +sblogo.bmp
 FRONTEND_GFX_TRANS_NO_ROT_IN :=		$(foreach FILE,$(FRONTEND_GFX_TRANS_NO_ROT),$(FRONTEND_GFX_DIR)/$(FILE))
 
-FRONTEND_GFX_TEX_IN :=		${FRONTEND_GFX_NONTRANS_IN} ${FRONTEND_GFX_TRANS_IN}  ${FRONTEND_GFX_TRANS_NO_ROT_IN}
-FRONTEND_GFX_TEX_OUT :=		$(FRONTEND_GFX_OUT_DIR)/frontend.Spr
-FRONTEND_GFX_REP_FILE :=	$(REPORT_DIR)/frontend.rep
-FRONTEND_GFX_HDR_FILE :=	$(INC_DIR)/frontend.h
+####
 
-cleanfrontend :
-		@$(RM) -f $(FRONTEND_GFX_TEX_OUT)
-		@$(ECHO) Frontend Cleaned
+FRONTENDGFX_SPR_DEP :=		$(FRONTEND_GFX_NONTRANS_IN) $(FRONTEND_GFX_TRANS_IN)  $(FRONTEND_GFX_TRANS_NO_ROT_IN)
 
-frontend:	$(FRONTEND_GFX_TEX_IN)
+FRONTENDGFX_SPR_IN :=		-r- -z+ $(FRONTEND_GFX_TRANS_NO_ROT_IN) -r+ \
+							$(FRONTEND_GFX_TRANS_IN) \
+							-z- $(FRONTEND_GFX_NONTRANS_IN)
 
-$(FRONTEND_GFX_TEX_OUT) :	$(FRONTEND_GFX_TEX_IN)
-		@parkgrab -r- -z+ ${FRONTEND_GFX_TRANS_NO_ROT_IN} -r+ ${FRONTEND_GFX_TRANS_IN} -z- ${FRONTEND_GFX_NONTRANS_IN} -b+ -t:13,1,1 -l:$(REPORT_DIR)/frontend.lbm -o:$(FRONTEND_GFX_TEX_OUT) -k:$(FRONTEND_GFX_REP_FILE)
-		@$(MV) -f $(FRONTEND_GFX_OUT_DIR)/frontend.h $(FRONTEND_GFX_HDR_FILE)
+# cleanfrontend :
+#		@$(RM) -f $(FRONTEND_GFX_TEX_OUT)
+#		@$(ECHO) Frontend Cleaned
+#
+# frontend:	$(FRONTEND_GFX_TEX_IN)
+#
+# $(FRONTEND_GFX_TEX_OUT) :	$(FRONTEND_GFX_TEX_IN)
+# 		@parkgrab -r- -z+ $(FRONTEND_GFX_TRANS_NO_ROT_IN) -r+ $(FRONTEND_GFX_TRANS_IN) -z- $(FRONTEND_GFX_NONTRANS_IN) -b+ -t:13,1,1 -l:$(REPORT_DIR)/frontend.lbm -o:$(FRONTEND_GFX_TEX_OUT) -k:$(FRONTEND_GFX_REP_FILE)
+# 		@$(MV) -f $(FRONTEND_GFX_OUT_DIR)/frontend.h $(FRONTEND_GFX_HDR_FILE)
+#
+# GRAF_DIRS_TO_MAKE	+=		$(FRONTEND_GFX_OUT_DIR)
+# GFX_DATA_OUT		+=		$(FRONTEND_GFX_TEX_OUT)
 
-GRAF_DIRS_TO_MAKE	+=		$(FRONTEND_GFX_OUT_DIR)
-GFX_DATA_OUT		+=		$(FRONTEND_GFX_TEX_OUT)
+#----------------------------------------------------------------------------
+#----------------------------------------------------------------------------
+SPRITES_OUT_DIR :=		$(DATA_OUT)/sprites
 
+SPRITES_ALL_DEP	:=		$(INGAMEGFX_SPR_DEP) \
+						$(FRONTENDGFX_SPR_DEP) \
+						$(ACTOR_SPR_DEP)
+ 
+SPRITES_ALL_IN :=		$(INGAMEGFX_SPR_IN) \
+ 						$(FRONTENDGFX_SPR_IN) \
+						$(ACTOR_SPR_IN)
+
+SPRITES_TEX_OUT :=		$(SPRITES_OUT_DIR)/Sprites.Spr
+
+SPRITES_HDR_OUT :=		$(INC_DIR)/Sprites.h
+
+cleansprites:
+		@$(RM) -f $(SPRITES_TEX_OUT)
+		@$(ECHO) Sprites Cleaned
+
+sprites:	$(SPRITES_ALL_DEP)
+
+$(SPRITES_TEX_OUT) : $(SPRITES_ALL_DEP)
+		@$(PARKGRAB) $(SPRITES_ALL_IN) -t:12,4,1 -l:$(SPRITES_OUT_DIR)/sprites.lbm -o:$(SPRITES_TEX_OUT)
+		@$(MV) -f $(SPRITES_OUT_DIR)/sprites.h $(SPRITES_HDR_OUT)
+		@$(ECHO) Sprites Made
+
+GRAF_DIRS_TO_MAKE	+=		$(SPRITES_OUT_DIR)
+GFX_DATA_OUT		+=		$(SPRITES_TEX_OUT)
+
+#----------------------------------------------------------------------------
+#----------------------------------------------------------------------------
+#	Text translations
+#----------------------------------------------------------------------------
+#----------------------------------------------------------------------------
+.PHONY: translate cleantranslate
+
+LANGUAGES :=	swe \
+				dut \
+				ita \
+				ger
+
+
+TRANS_IN_DIR :=			$(GAME_DATA_DIR)/translations
+TRANS_OUT_DIR :=		$(DATA_OUT)/translations
+TRANS_LBM_OUT_DIR :=	$(REPORT_DIR)/translations
+
+TRANS_IN_ENG :=			$(TRANS_IN_DIR)/text.dat
+
+TRANS_FINAL_DAT_FILE :=	$(TRANS_OUT_DIR)/final.dat
+
+ALL_TRANS_OUT_DIRS :=	$(TRANS_OUT_DIR) \
+						$(TRANS_LBM_OUT_DIR)
+
+ALL_TRANS_IN_FILES :=	$(foreach FILE,$(LANGUAGES),$(TRANS_IN_DIR)/$(FILE).dat)
+
+TRANS_IN_FILES :=	$(TRANS_IN_ENG) $(ALL_TRANS_IN_FILES)
+
+TRANS_OUT_DAT :=	$(foreach FILE,	$(LANGUAGES),$(TRANS_OUT_DIR)/$(FILE).dat) $(TRANS_OUT_DIR)/id.dat $(TRANS_OUT_DIR)/eng.dat
+#$(TRANS_OUT_KANJI_TAB)
+TRANS_OUT_HDR :=	$(INC_DIR)/trans.h
+
+SCRIPT_TRANS_HDR :=	$(GAME_DATA_DIR)/scripts/defs/trans.scr
+
+TRANS_OUT_FILES :=	$(TRANS_OUT_HDR) $(TRANS_OUT_DAT) $(TRANS_OUT_LBM_LIST) $(TRANS_FINAL_DAT_FILE)
+
+$(TRANS_OUT_FILES) : $(TRANS_IN_FILES)
+	@perl tools/perl/pl/lang.pl $(TRANS_IN_ENG)  $(TRANS_FINAL_DAT_FILE) $(ALL_TRANS_IN_FILES)
+	@transtext $(LANG_OP) -h:$(TRANS_OUT_HDR) -o:$(TRANS_OUT_DIR) $(TRANS_FINAL_DAT_FILE)
+	@perl tools/perl/pl/text_extract.pl $(TRANS_OUT_HDR) $(SCRIPT_TRANS_HDR) STR__INGAME__
+
+translate : $(TRANS_OUT_FILES)
+	@$(ECHO) made translations
+
+cleantranslate:
+	@$(RM) -f $(TRANS_OUT_FILES)
+	@$(ECHO) Translations Cleaned
+
+GFX_DATA_OUT +=	$(TRANS_OUT_DAT)
 
 #----------------------------------------------------------------------------
 # Big TGA backdrops
@@ -449,12 +472,12 @@ GFX_DATA_OUT		+=	$(MUSIC_ALL_OUT)
 #----------------------------------------------------------------------------
 SCRIPTS_LIST		:=	test \
 						speechtest
-
+ 
 SCRIPTS_IN_DIR		:=	$(GAME_DATA_DIR)/scripts
-
+ 
 SCRIPTS_OUT_DIR		:=	$(DATA_OUT)/scripts
 SCRIPTS_OUT			:=	$(foreach SCRIPT,$(SCRIPTS_LIST),$(SCRIPTS_OUT_DIR)/$(SCRIPT).dat)
-
+ 
 scripts : $(SCRIPTS_OUT)
 
 cleanscripts:
@@ -493,7 +516,6 @@ $(DEMO_ALL_OUT) : $(DEMO_ALL_IN)
 GRAF_DIRS_TO_MAKE	+=	$(DEMO_OUT_DIR)
 GFX_DATA_OUT		+=	$(DEMO_ALL_OUT)
 
-
 #----------------------------------------------------------------------------
 # Dirs to Make
 #----------------------------------------------------------------------------
@@ -541,6 +563,7 @@ $(BIGLUMP_OUT) : $(BIGLUMP_IN)
 all : 	dirs gdirs \
 		actors \
 		levels \
+		sprites \
 		biglump
 		@$(ECHO) Graphics made
 

source/frontend/credits.cpp

@@ -55,8 +55,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_FRONTEND_H__
-#include <frontend.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/frontend/demomode.cpp

@@ -57,8 +57,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_FRONTEND_H__
-#include <frontend.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/frontend/frontend.cpp

@@ -77,8 +77,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_FRONTEND_H__
-#include <frontend.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 
@@ -164,7 +164,7 @@ void CFrontEndScene::init()
 #endif
 
 	m_sprites=new ("MainTitle Sprites") SpriteBank();
-	m_sprites->load(FRONTEND_FRONTEND_SPR);
+	m_sprites->load(SPRITES_SPRITES_SPR);
 	
 	m_font=new ("frontendfont") FontBank();
 	m_font->initialise(&standardFont);

source/frontend/maintitl.cpp

@@ -73,8 +73,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_FRONTEND_H__
-#include <frontend.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 
@@ -118,7 +118,7 @@ int sval=0;
 void CFrontEndMainTitles::init()
 {
 	m_sprites=new ("MainTitle Sprites") SpriteBank();
-	m_sprites->load(FRONTEND_FRONTEND_SPR);
+	m_sprites->load(SPRITES_SPRITES_SPR);
 
 	m_smallFont=new ("MainTitle SmallFont") FontBank();
 	m_smallFont->initialise(&standardFont);

source/frontend/options.cpp

@@ -73,12 +73,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_FRONTEND_H__
-#include <frontend.h>
-#endif
-
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/frontend/scrollbg.cpp

@@ -33,8 +33,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_FRONTEND_H__
-#include <frontend.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 
@@ -63,7 +63,7 @@
 void CScrollyBackground::init()
 {
 	m_sprites=new ("Scrolly Background sprites") SpriteBank;
-	m_sprites->load(FRONTEND_FRONTEND_SPR);
+	m_sprites->load(SPRITES_SPRITES_SPR);
 	m_xOff=m_yOff=0;
 
 	setSpeed(DEFAULT_X_SPEED,DEFAULT_Y_SPEED);

source/frontend/start.cpp

@@ -49,8 +49,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_FRONTEND_H__
-#include <frontend.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/game/convo.cpp

@@ -57,8 +57,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 #ifndef __STRING_ENUMS__
@@ -135,7 +135,7 @@ void CConversation::init()
 		s_guiIcon->init(s_guiFrame);
 		s_guiIcon->setObjectXYWH(0,0,FRAME_HEIGHT,FRAME_HEIGHT);
 		s_guiIcon->setOt(OT_POS);
-		s_guiIcon->setSpriteBank(INGAMEFX_INGAMEFX_SPR);
+		s_guiIcon->setSpriteBank(SPRITES_SPRITES_SPR);
 		s_guiIcon->setFrame(0);
 
 		s_guiText=new("Conversation Text") CGUITextBox();

source/game/game.cpp

@@ -103,8 +103,8 @@
 #include "gfx\bubicles.h"
 #endif
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 #ifndef _ANIMTEX_HEADER_
@@ -130,9 +130,6 @@
 
 #include "gfx\actor.h"
 
-
-//int		GX=512/2;
-//int		GY=256/;
 int			RenderZ=256;
 
 /*****************************************************************************/

source/gfx/bubicles.cpp

@@ -45,8 +45,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 
@@ -388,7 +388,7 @@ void CBubicleFactory::init()
 	CBubicle		*bub;
 
 	s_sprites=new ("Bubble Sprites") SpriteBank();
-	s_sprites->load(INGAMEFX_INGAMEFX_SPR);
+	s_sprites->load(SPRITES_SPRITES_SPR);
 
 	for(i=0;i<s_frameTabSize;i++)
 	{

source/gfx/fdata.cpp

@@ -22,7 +22,9 @@
 #include	"biglump.h"
 #endif
 
-#include	<ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
+#endif
 
 
 /*	Std Lib
@@ -84,7 +86,7 @@ s16	standardFontTab[]=
 	/* ð ñ ò ó ô õ ö ÷ */	      -1,      -1,FRM__242,FRM__243,FRM__244,FRM__245,FRM__246,      -1,
 	/* ø ù ú û ü ý þ ÿ */	      -1,FRM__249,FRM__250,FRM__251,FRM__252,FRM__253,      -1,FRM__255,
 };
-FontData	standardFont( INGAMEFX_INGAMEFX_SPR,	standardFontTab,	13,	1,1, 4 );
+FontData	standardFont( SPRITES_SPRITES_SPR,	standardFontTab,	13,	1,1, 4 );
 
 /*----------------------------------------------------------------------
 	Function:

source/gui/greadout.cpp

@@ -204,7 +204,7 @@ void CGUISpriteReadout::init(CGUIObject *_parent,GUIId _id)
 	m_lastValue=-1;
 	m_frame=0;
 	m_x=m_y=0;
-	setSpriteBank(INGAMEFX_INGAMEFX_SPR);
+	setSpriteBank(SPRITES_SPRITES_SPR);
 }
 
 

source/gui/gui.cpp

@@ -37,8 +37,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGMAEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 
@@ -422,7 +422,7 @@ void initGUIStuff()
 	ASSERT(!s_uiSpriteBank);
 
 	s_uiSpriteBank=new ("UI Sprites") SpriteBank();
-	s_uiSpriteBank->load(INGAMEFX_INGAMEFX_SPR);
+	s_uiSpriteBank->load(SPRITES_SPRITES_SPR);
 }
 
 

source/level/layertile3d.cpp

@@ -116,6 +116,11 @@ sOT				*ThisOT;
 MATRIX			&CamMtx=CGameScene::GetCamMtx();
 VECTOR			BlkPos;
 
+extern int RenderZ;
+		SetGeomScreen(RenderZ);
+		CamMtx.t[2]=RenderZ;
+		SetTransMatrix(&CamMtx);		
+
 		SetIdentNoTrans(&CamMtx);
 		SetRotMatrix(&CamMtx);
 

source/paul/paul.cpp

@@ -89,8 +89,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/pballoon.cpp

@@ -52,8 +52,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/pblower.cpp

@@ -36,8 +36,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/pbubmix.cpp

@@ -40,8 +40,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/pglasses.cpp

@@ -36,8 +36,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/phealth.cpp

@@ -40,8 +40,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/phelmet.cpp

@@ -36,8 +36,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/pickup.cpp

@@ -82,8 +82,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 
@@ -114,7 +114,7 @@ void	CBasePickup::init()
 	CPickupThing::init();
 
 	m_spriteBank=new ("pickup sprite") SpriteBank();
-	m_spriteBank->load(INGAMEFX_INGAMEFX_SPR);
+	m_spriteBank->load(SPRITES_SPRITES_SPR);
 }
 
 /*----------------------------------------------------------------------

source/pickups/pjlammo.cpp

@@ -40,8 +40,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/plife.cpp

@@ -40,8 +40,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/pnet.cpp

@@ -32,8 +32,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 #ifndef	__GFX_OTPOS_H__

source/pickups/pquest.cpp

@@ -40,8 +40,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/pshoes.cpp

@@ -40,8 +40,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/pickups/pspatula.cpp

@@ -36,8 +36,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/player/player.cpp

@@ -83,8 +83,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 
@@ -249,7 +249,7 @@ void	CPlayer::init()
 	m_fontBank->setOt(5);
 
 	m_spriteBank=new ("PlayerSprites") SpriteBank();
-	m_spriteBank->load(INGAMEFX_INGAMEFX_SPR);
+	m_spriteBank->load(SPRITES_SPRITES_SPR);
 
 	m_layerCollision=NULL;
 

source/player/pmbloon.cpp

@@ -36,8 +36,8 @@
 #include <ACTOR_SPONGEBOB_ANIM.h>
 #endif
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/player/pmbubble.cpp

@@ -36,8 +36,8 @@
 #include <ACTOR_SPONGEBOB_ANIM.h>
 #endif
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/player/pmcoral.cpp

@@ -57,8 +57,8 @@
 #include <ACTOR_SPONGEBOB_ANIM.h>
 #endif
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/player/pmjelly.cpp

@@ -44,8 +44,8 @@
 #include <ACTOR_SPONGEBOB_ANIM.h>
 #endif
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/player/pmnet.cpp

@@ -45,8 +45,8 @@
 #include <ACTOR_SPONGEBOB_ANIM.h>
 #endif
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 

source/projectl/projectl.cpp

@@ -27,8 +27,8 @@
 #include <biglump.h>
 #endif
 
-#ifndef __SPR_INGAMEFX_H__
-#include <ingamefx.h>
+#ifndef __SPR_SPRITES_H__
+#include <sprites.h>
 #endif
 
 #ifndef __VID_HEADER_
@@ -55,7 +55,7 @@ void CProjectile::init()
 	CEnemyProjectileThing::init();
 
 	m_spriteBank=new ("projectile sprites") SpriteBank();
-	m_spriteBank->load(INGAMEFX_INGAMEFX_SPR);
+	m_spriteBank->load(SPRITES_SPRITES_SPR);
 
 	m_heading = 0;
 	m_lifetime = GameState::getOneSecondInFrames() * 2;
@@ -389,7 +389,7 @@ void CPlayerProjectile::init()
 	CPlayerProjectileThing::init();
 
 	m_spriteBank=new ("projectile sprites") SpriteBank();
-	m_spriteBank->load(INGAMEFX_INGAMEFX_SPR);
+	m_spriteBank->load(SPRITES_SPRITES_SPR);
 
 	m_heading = 0;
 	m_lifetime = GameState::getOneSecondInFrames() * 2;

source/script/function.cpp

@@ -199,7 +199,7 @@ static signed short func_drawSprite(unsigned short *_args)
 	if(!sb)
 	{
 		sb=new ("sb") SpriteBank;
-		sb->load(INGAMEFX_INGAMEFX_SPR);
+		sb->load(SPRITES_SPRITES_SPR);
 	}
 	fh=sb->getFrameHeader(_args[0]);
 	sb->printFT4(_args[0],_args[1]-(fh->W/2),_args[2]-(fh->H/2),0,0,_args[3]);

source/system/main.cpp

@@ -77,12 +77,14 @@ CPaulScene s_paulScene;
 #endif
 
 
+/*****************************************************************************/
+static SpriteBank	GenericSpriteBank;
+
 /*****************************************************************************/
 
 void	SaveScreen(RECT R);
 
 /*****************************************************************************/
-
 void	InitSystem()	// reordered to reduce black screen (hope all is well
 {
 	ResetCallback();
@@ -120,12 +122,13 @@ void	InitSystem()	// reordered to reduce black screen (hope all is well
 	CBubicleFactory::init();
 
 	CActorPool::AddActor(ACTORS_SPONGEBOB_SBK);
+	GenericSpriteBank.load(SPRITES_SPRITES_SPR);
+
 
 #if defined(__DEBUG_MEM__)
 	DebugMemFontInit();
 #endif
 
-
 #ifdef __USER_paul__
 s_paulScene.init();
 #endif