From 0f311e703d0f8f8fb7cfda452f123d166b9dcb3b Mon Sep 17 00:00:00 2001 From: Daveo Date: Fri, 20 Apr 2001 14:53:35 +0000 Subject: [PATCH] --- data/DataCache.scr | 9 +- data/Scripts/test.scr | 2 +- makefile.gfx | 225 +++++++++++++++++++---------------- source/frontend/credits.cpp | 4 +- source/frontend/demomode.cpp | 4 +- source/frontend/frontend.cpp | 6 +- source/frontend/maintitl.cpp | 6 +- source/frontend/options.cpp | 8 +- source/frontend/scrollbg.cpp | 6 +- source/frontend/start.cpp | 4 +- source/game/convo.cpp | 6 +- source/game/game.cpp | 7 +- source/gfx/bubicles.cpp | 6 +- source/gfx/fdata.cpp | 6 +- source/gui/greadout.cpp | 2 +- source/gui/gui.cpp | 6 +- source/level/layertile3d.cpp | 5 + source/paul/paul.cpp | 4 +- source/pickups/pballoon.cpp | 4 +- source/pickups/pblower.cpp | 4 +- source/pickups/pbubmix.cpp | 4 +- source/pickups/pglasses.cpp | 4 +- source/pickups/phealth.cpp | 4 +- source/pickups/phelmet.cpp | 4 +- source/pickups/pickup.cpp | 6 +- source/pickups/pjlammo.cpp | 4 +- source/pickups/plife.cpp | 4 +- source/pickups/pnet.cpp | 4 +- source/pickups/pquest.cpp | 4 +- source/pickups/pshoes.cpp | 4 +- source/pickups/pspatula.cpp | 4 +- source/player/player.cpp | 6 +- source/player/pmbloon.cpp | 4 +- source/player/pmbubble.cpp | 4 +- source/player/pmcoral.cpp | 4 +- source/player/pmjelly.cpp | 4 +- source/player/pmnet.cpp | 4 +- source/projectl/projectl.cpp | 8 +- source/script/function.cpp | 2 +- source/system/main.cpp | 7 +- 40 files changed, 220 insertions(+), 193 deletions(-) diff --git a/data/DataCache.scr b/data/DataCache.scr index 341a08359..541d07185 100644 --- a/data/DataCache.scr +++ b/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 + diff --git a/data/Scripts/test.scr b/data/Scripts/test.scr index 9810dca7e..d39049682 100644 --- a/data/Scripts/test.scr +++ b/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 /* diff --git a/makefile.gfx b/makefile.gfx index b7d78374b..2888901a3 100644 --- a/makefile.gfx +++ b/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 diff --git a/source/frontend/credits.cpp b/source/frontend/credits.cpp index 28feaaf1b..ca4e8e110 100644 --- a/source/frontend/credits.cpp +++ b/source/frontend/credits.cpp @@ -55,8 +55,8 @@ /* Data ---- */ -#ifndef __SPR_FRONTEND_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/frontend/demomode.cpp b/source/frontend/demomode.cpp index 95abee0be..168c1e34e 100644 --- a/source/frontend/demomode.cpp +++ b/source/frontend/demomode.cpp @@ -57,8 +57,8 @@ /* Data ---- */ -#ifndef __SPR_FRONTEND_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/frontend/frontend.cpp b/source/frontend/frontend.cpp index 6dfaa1c9e..e0cd8b0b4 100644 --- a/source/frontend/frontend.cpp +++ b/source/frontend/frontend.cpp @@ -77,8 +77,8 @@ /* Data ---- */ -#ifndef __SPR_FRONTEND_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #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); diff --git a/source/frontend/maintitl.cpp b/source/frontend/maintitl.cpp index aac2d3b46..9663551e1 100644 --- a/source/frontend/maintitl.cpp +++ b/source/frontend/maintitl.cpp @@ -73,8 +73,8 @@ /* Data ---- */ -#ifndef __SPR_FRONTEND_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #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); diff --git a/source/frontend/options.cpp b/source/frontend/options.cpp index 3945794c3..6a77ee215 100644 --- a/source/frontend/options.cpp +++ b/source/frontend/options.cpp @@ -73,12 +73,8 @@ /* Data ---- */ -#ifndef __SPR_FRONTEND_H__ -#include -#endif - -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/frontend/scrollbg.cpp b/source/frontend/scrollbg.cpp index b6281e2b8..bdd0dcd07 100644 --- a/source/frontend/scrollbg.cpp +++ b/source/frontend/scrollbg.cpp @@ -33,8 +33,8 @@ /* Data ---- */ -#ifndef __SPR_FRONTEND_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #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); diff --git a/source/frontend/start.cpp b/source/frontend/start.cpp index b887743b6..c66e5a3ee 100644 --- a/source/frontend/start.cpp +++ b/source/frontend/start.cpp @@ -49,8 +49,8 @@ /* Data ---- */ -#ifndef __SPR_FRONTEND_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/game/convo.cpp b/source/game/convo.cpp index 103472343..1c562a0b0 100644 --- a/source/game/convo.cpp +++ b/source/game/convo.cpp @@ -57,8 +57,8 @@ /* Data ---- */ -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #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(); diff --git a/source/game/game.cpp b/source/game/game.cpp index 7a2dd5049..bb0f0eaa4 100644 --- a/source/game/game.cpp +++ b/source/game/game.cpp @@ -103,8 +103,8 @@ #include "gfx\bubicles.h" #endif -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif #ifndef _ANIMTEX_HEADER_ @@ -130,9 +130,6 @@ #include "gfx\actor.h" - -//int GX=512/2; -//int GY=256/; int RenderZ=256; /*****************************************************************************/ diff --git a/source/gfx/bubicles.cpp b/source/gfx/bubicles.cpp index 4208ffa43..4378a3deb 100644 --- a/source/gfx/bubicles.cpp +++ b/source/gfx/bubicles.cpp @@ -45,8 +45,8 @@ /* Data ---- */ -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #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 +#ifndef __SPR_SPRITES_H__ +#include +#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: diff --git a/source/gui/greadout.cpp b/source/gui/greadout.cpp index 55c937b44..6d8eee1c0 100644 --- a/source/gui/greadout.cpp +++ b/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); } diff --git a/source/gui/gui.cpp b/source/gui/gui.cpp index 2530d0f9e..eda5d945c 100644 --- a/source/gui/gui.cpp +++ b/source/gui/gui.cpp @@ -37,8 +37,8 @@ /* Data ---- */ -#ifndef __SPR_INGMAEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #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); } diff --git a/source/level/layertile3d.cpp b/source/level/layertile3d.cpp index 1bcf378c1..2aba1d78f 100644 --- a/source/level/layertile3d.cpp +++ b/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); diff --git a/source/paul/paul.cpp b/source/paul/paul.cpp index 67fff755a..0fc0124f3 100644 --- a/source/paul/paul.cpp +++ b/source/paul/paul.cpp @@ -89,8 +89,8 @@ /* Data ---- */ -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/pickups/pballoon.cpp b/source/pickups/pballoon.cpp index 56a59fd27..208c91d30 100644 --- a/source/pickups/pballoon.cpp +++ b/source/pickups/pballoon.cpp @@ -52,8 +52,8 @@ /* Data ---- */ -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/pickups/pblower.cpp b/source/pickups/pblower.cpp index e17a6b501..2846fb0d6 100644 --- a/source/pickups/pblower.cpp +++ b/source/pickups/pblower.cpp @@ -36,8 +36,8 @@ /* Data ---- */ -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/pickups/pbubmix.cpp b/source/pickups/pbubmix.cpp index 131702042..934022696 100644 --- a/source/pickups/pbubmix.cpp +++ b/source/pickups/pbubmix.cpp @@ -40,8 +40,8 @@ /* Data ---- */ -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/pickups/pglasses.cpp b/source/pickups/pglasses.cpp index c0288f12c..fe633a08c 100644 --- a/source/pickups/pglasses.cpp +++ b/source/pickups/pglasses.cpp @@ -36,8 +36,8 @@ /* Data ---- */ -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/pickups/phealth.cpp b/source/pickups/phealth.cpp index 15d89f443..9215cf7ee 100644 --- a/source/pickups/phealth.cpp +++ b/source/pickups/phealth.cpp @@ -40,8 +40,8 @@ /* Data ---- */ -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/pickups/phelmet.cpp b/source/pickups/phelmet.cpp index 3eb11f345..9098bf57f 100644 --- a/source/pickups/phelmet.cpp +++ b/source/pickups/phelmet.cpp @@ -36,8 +36,8 @@ /* Data ---- */ -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/pickups/pickup.cpp b/source/pickups/pickup.cpp index acd93a90b..88c0b2c14 100644 --- a/source/pickups/pickup.cpp +++ b/source/pickups/pickup.cpp @@ -82,8 +82,8 @@ /* Data ---- */ -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #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); } /*---------------------------------------------------------------------- diff --git a/source/pickups/pjlammo.cpp b/source/pickups/pjlammo.cpp index baa3b38bd..bc0ad383b 100644 --- a/source/pickups/pjlammo.cpp +++ b/source/pickups/pjlammo.cpp @@ -40,8 +40,8 @@ /* Data ---- */ -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/pickups/plife.cpp b/source/pickups/plife.cpp index bed94877b..cd48c5868 100644 --- a/source/pickups/plife.cpp +++ b/source/pickups/plife.cpp @@ -40,8 +40,8 @@ /* Data ---- */ -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/pickups/pnet.cpp b/source/pickups/pnet.cpp index 5e1746e34..22fd05cf5 100644 --- a/source/pickups/pnet.cpp +++ b/source/pickups/pnet.cpp @@ -32,8 +32,8 @@ /* Data ---- */ -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif #ifndef __GFX_OTPOS_H__ diff --git a/source/pickups/pquest.cpp b/source/pickups/pquest.cpp index 6ddbd94a0..29d458adb 100644 --- a/source/pickups/pquest.cpp +++ b/source/pickups/pquest.cpp @@ -40,8 +40,8 @@ /* Data ---- */ -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/pickups/pshoes.cpp b/source/pickups/pshoes.cpp index 1b50b3147..723086add 100644 --- a/source/pickups/pshoes.cpp +++ b/source/pickups/pshoes.cpp @@ -40,8 +40,8 @@ /* Data ---- */ -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/pickups/pspatula.cpp b/source/pickups/pspatula.cpp index 032d6c7cd..a7bc61f1e 100644 --- a/source/pickups/pspatula.cpp +++ b/source/pickups/pspatula.cpp @@ -36,8 +36,8 @@ /* Data ---- */ -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/player/player.cpp b/source/player/player.cpp index 3ffdcc4e4..114931854 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -83,8 +83,8 @@ /* Data ---- */ -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #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; diff --git a/source/player/pmbloon.cpp b/source/player/pmbloon.cpp index 2e1973441..16a24d52d 100644 --- a/source/player/pmbloon.cpp +++ b/source/player/pmbloon.cpp @@ -36,8 +36,8 @@ #include #endif -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/player/pmbubble.cpp b/source/player/pmbubble.cpp index 0353c7f22..5fa29923f 100644 --- a/source/player/pmbubble.cpp +++ b/source/player/pmbubble.cpp @@ -36,8 +36,8 @@ #include #endif -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/player/pmcoral.cpp b/source/player/pmcoral.cpp index 9f95c6004..b4b5e3009 100644 --- a/source/player/pmcoral.cpp +++ b/source/player/pmcoral.cpp @@ -57,8 +57,8 @@ #include #endif -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/player/pmjelly.cpp b/source/player/pmjelly.cpp index d57ee3fcc..be6d1255c 100644 --- a/source/player/pmjelly.cpp +++ b/source/player/pmjelly.cpp @@ -44,8 +44,8 @@ #include #endif -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/player/pmnet.cpp b/source/player/pmnet.cpp index b91115518..54ad452ca 100644 --- a/source/player/pmnet.cpp +++ b/source/player/pmnet.cpp @@ -45,8 +45,8 @@ #include #endif -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #endif diff --git a/source/projectl/projectl.cpp b/source/projectl/projectl.cpp index 9dbfe7118..199e44f51 100644 --- a/source/projectl/projectl.cpp +++ b/source/projectl/projectl.cpp @@ -27,8 +27,8 @@ #include #endif -#ifndef __SPR_INGAMEFX_H__ -#include +#ifndef __SPR_SPRITES_H__ +#include #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; diff --git a/source/script/function.cpp b/source/script/function.cpp index b4550cd57..e09eb7f0c 100644 --- a/source/script/function.cpp +++ b/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]); diff --git a/source/system/main.cpp b/source/system/main.cpp index a53ee55d5..d9461a1bd 100644 --- a/source/system/main.cpp +++ b/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