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-04-04 20:50:42 +00:00
parent bb04207d41
commit f2a347047f
13 changed files with 57 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/DataCache.scr
View file

@ -468,6 +468,5 @@ actors/STOMPER.SBK
{ SYSTEM_CACHE 4
}
ui/uigfx.spr
frontend/frontend.spr
ingamefx/ingamefx.spr

2
data/Scripts/test.scr
View file

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

82
makefile.gfx
View file

@ -160,10 +160,6 @@ ACTOR_IN := *
# $(foreach ACTOR,$(ACTOR_LIST),$(ACTOR_IN_DIR)/$(ACTOR)/$(ACTOR_SPRITE_DIR)/bmp)
ACTOR_OUT := $(foreach ACTOR,$(ACTOR_LIST),$(ACTOR_OUT_DIR)/$(ACTOR).Sbk)
UI_GFX_TEX_OUT := $(UI_GFX_OUT_DIR)/UIGfx.Spr
UI_GFX_REP_FILE := $(REPORT_DIR)/UIGfx.rep
UI_GFX_HDR_FILE := $(INC_DIR)/UIGfx.h
cleanactors :
@$(RM) -f $(ACTOR_OUT)
@$(ECHO) Actors Cleaned
@ -225,12 +221,31 @@ cleantranslate:
GFX_DATA_OUT += $(TRANS_OUT_DAT)
#----------------------------------------------------------------------------
#--- UI ---------------------------------------------------------------------
# Ingame graphics and UI
#----------------------------------------------------------------------------
INGAMEFX_GFX_DIR := $(GRAF_DIR)/ingamefx
INGAMEFX_GFX_OUT_DIR := $(DATA_OUT)/ingamefx
####
INGAMEFX_GFX_NONTRANS :=
INGAMEFX_GFX_NONTRANS_IN := $(foreach FILE,$(INGAMEFX_GFX_NONTRANS),$(INGAMEFX_NONTRANS_DIR)/$(FILE))
PICKUP_GFX_DIR := $(GRAF_DIR)/pickups
PICKUP_GFX := +spatula +pants +health100 +health50 +health25 +glint1 +glint2 +glint3 +glint4 \
+jellyammo +bubblemixture +bubblewand +glasses +shoe +balloon +helmet \
+teeth +blower +net
PICKUP_GFX_IN := $(foreach FILE,$(PICKUP_GFX),$(PICKUP_GFX_DIR)/$(FILE).bmp)
INGAMEFX_GFX_TRANS := +bubble_1 +bubble_2 +bubble_3
INGAMEFX_GFX_TRANS_IN := $(foreach FILE,$(INGAMEFX_GFX_TRANS),$(INGAMEFX_GFX_DIR)/$(FILE).bmp)
####
UI_GFX_DIR := $(GRAF_DIR)/ui
UI_FONT_DIR := $(GRAF_DIR)/font
UI_GFX_OUT_DIR := $(DATA_OUT)/ui
UI_GFX_FONT := smallfont/+33 smallfont/+34 smallfont/+37 smallfont/+39 smallfont/+40 \
smallfont/+41 smallfont/+42 smallfont/+43 smallfont/+44 smallfont/+45 \
@ -273,57 +288,35 @@ UI_GFX_TRANS := +bambootopleft.bmp +bamboobotleft.bmp +bambootopright.bmp +ba
+butC.bmp +butS.bmp +butX.bmp +butT.bmp
UI_GFX_TRANS_IN := $(foreach FILE,$(UI_GFX_TRANS),$(UI_GFX_DIR)/$(FILE))
UI_GFX_TEX_IN := ${UI_GFX_FONT_IN} ${UI_GFX_NONTRANS_IN} ${UI_GFX_TRANS_IN}
UI_GFX_TEX_OUT := $(UI_GFX_OUT_DIR)/UIGfx.Spr
UI_GFX_REP_FILE := $(REPORT_DIR)/UIGfx.rep
UI_GFX_HDR_FILE := $(INC_DIR)/UIGfx.h
####
cleanui :
@$(RM) -f $(UI_GFX_TEX_OUT)
@$(ECHO) UI Gfx Cleaned
ui: $(UI_GFX_TEX_IN)
$(UI_GFX_TEX_OUT) : $(UI_GFX_TEX_IN)
@parkgrab -c+ -z+ $(UI_GFX_FONT_IN) ${UI_GFX_TRANS_IN} -c- -z- ${UI_GFX_NONTRANS_IN} -b+ -t:15,1,1 -l:$(REPORT_DIR)/ui.lbm -o:$(UI_GFX_TEX_OUT) -k:$(UI_GFX_REP_FILE)
@$(MV) -f $(UI_GFX_OUT_DIR)/uigfx.h $(UI_GFX_HDR_FILE)
GFX_DATA_OUT += $(UI_GFX_TEX_OUT)
#----------------------------------------------------------------------------
# Ingame graphic effects
# Also contins pickup graphics at the moment..
#----------------------------------------------------------------------------
INGAMEFX_GFX_DIR := $(GRAF_DIR)/ingamefx
INGAMEFX_GFX_OUT_DIR := $(DATA_OUT)/ingamefx
INGAMEFX_GFX_NONTRANS :=
INGAMEFX_GFX_NONTRANS_IN := $(foreach FILE,$(INGAMEFX_GFX_NONTRANS),$(INGAMEFX_NONTRANS_DIR)/$(FILE))
PICKUP_GFX_DIR := $(GRAF_DIR)/pickups
PICKUP_GFX := +spatula +pants +health100 +health50 +health25 +glint1 +glint2 +glint3 +glint4 \
+jellyammo +bubblemixture +bubblewand +glasses +shoe +balloon +helmet \
+teeth +blower +net
PICKUP_GFX_IN := $(foreach FILE,$(PICKUP_GFX),$(PICKUP_GFX_DIR)/$(FILE).bmp)
INGAMEFX_GFX_TRANS := +bubble_1 +bubble_2 +bubble_3
INGAMEFX_GFX_TRANS_IN := $(foreach FILE,$(INGAMEFX_GFX_TRANS),$(INGAMEFX_GFX_DIR)/$(FILE).bmp)
INGAMEFX_GFX_TEX_IN := ${INGAMEFX_GFX_NONTRANS_IN} ${INGAMEFX_GFX_TRANS_IN} ${PICKUP_GFX_IN}
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 -z+ ${INGAMEFX_GFX_TRANS_IN} ${PICKUP_GFX_IN} -z- ${INGAMEFX_GFX_NONTRANS_IN} -b+ -t:13,1,1 -l:$(REPORT_DIR)/ingamefx.lbm -o:$(INGAMEFX_GFX_TEX_OUT) -k:$(INGAMEFX_GFX_REP_FILE)
@parkgrab -z+ ${INGAMEFX_GFX_TRANS_IN} ${PICKUP_GFX_IN} \
-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)
@ -355,7 +348,7 @@ cleanfrontend :
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:14,1,1 -l:$(REPORT_DIR)/frontend.lbm -o:$(FRONTEND_GFX_TEX_OUT) -k:$(FRONTEND_GFX_REP_FILE)
@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)
@ -534,7 +527,6 @@ GFX_DATA_OUT += $(DEMO_ALL_OUT)
#----------------------------------------------------------------------------
GRAF_DIRS_TO_MAKE += $(TRANS_OUT_DIR) \
$(UI_GFX_OUT_DIR) \
$(ACTORS_DIRS_TO_MAKE) \
$(LEVELS_DIRS_TO_MAKE)

4
source/enemy/npc.cpp
View file

@ -21,10 +21,6 @@
#include <biglump.h>
#endif
#ifndef __SPR_UIGFX_H__
#include <uigfx.h>
#endif
#ifndef __GAME_GAME_H__
#include "game\game.h"
#endif

4
source/frontend/options.cpp
View file

@ -77,8 +77,8 @@
#include <frontend.h>
#endif
#ifndef __SPR_UIGFX_H__
#include <uigfx.h>
#ifndef __SPR_INGAMEFX_H__
#include <ingamefx.h>
#endif

6
source/game/convo.cpp
View file

@ -57,8 +57,8 @@
/* Data
---- */
#ifndef __SPR_UIGFX_H__
#include <uigfx.h>
#ifndef __SPR_INGAMEFX_H__
#include <ingamefx.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(UI_UIGFX_SPR);
s_guiIcon->setSpriteBank(INGAMEFX_INGAMEFX_SPR);
s_guiIcon->setFrame(0);
s_guiText=new("Conversation Text") CGUITextBox();

4
source/gfx/fdata.cpp
View file

@ -22,7 +22,7 @@
#include "biglump.h"
#endif
#include <UiGfx.h>
#include <ingamefx.h>
/* Std Lib
@ -84,7 +84,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( UI_UIGFX_SPR, standardFontTab, 13, 1,1, 4 );
FontData standardFont( INGAMEFX_INGAMEFX_SPR, standardFontTab, 13, 1,1, 4 );
/*----------------------------------------------------------------------
Function:

2
source/gui/greadout.cpp
View file

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

6
source/gui/gui.cpp
View file

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

4
source/paul/paul.cpp
View file

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

6
source/projectl/projectl.cpp
View file

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

2
source/script/function.cpp
View file

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

4
source/system/vid.cpp
View file

@ -7,10 +7,6 @@
#include "gfx\prim.h"
#include "fileio\fileio.h"
#ifndef __SPR_UIGFX_H__
#include <uigfx.h>
#endif
/*****************************************************************************/
#define MaxVBFuncs 4