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-08-07 15:41:47 +00:00
parent 4eaf0f7ab2
commit e8512d179f
4 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/DataCache.scr
View file

@ -123,6 +123,7 @@ loadingscreens/monitor.gfx
loadingscreens/pickles.gfx loadingscreens/pickles.gfx
loadingscreens/pineapple.gfx loadingscreens/pineapple.gfx
loadingscreens/pizza.gfx loadingscreens/pizza.gfx
loadingscreens/teenage.gfx
loadingscreens/bootscreen.gfx loadingscreens/bootscreen.gfx
memcard/memhead.bin memcard/memhead.bin
ui/map/map_background.gfx ui/map/map_background.gfx

2
makefile.gfx
View file

@ -516,7 +516,7 @@ GFX_DATA_OUT += $(MAPSCREENS_OUT)
# Loading screens # Loading screens
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
LOADINGSCREENS_IN_DIR := $(GRAF_DIR)/loadingscreens LOADINGSCREENS_IN_DIR := $(GRAF_DIR)/loadingscreens
LOADINGSCREENS_IN := culture karate monitor pickles pineapple pizza bootscreen LOADINGSCREENS_IN := culture karate monitor pickles pineapple pizza teenage bootscreen
LOADINGSCREENS_OUT_DIR := $(DATA_OUT)/loadingscreens LOADINGSCREENS_OUT_DIR := $(DATA_OUT)/loadingscreens
LOADINGSCREENS_OUT := $(foreach SCREEN,$(LOADINGSCREENS_IN),$(LOADINGSCREENS_OUT_DIR)/$(SCREEN).gfx) LOADINGSCREENS_OUT := $(foreach SCREEN,$(LOADINGSCREENS_IN),$(LOADINGSCREENS_OUT_DIR)/$(SCREEN).gfx)

7
source/fma/fma.cpp
View file

@ -1201,13 +1201,12 @@ int s_chosenScript=CFmaScene::FMA_SCRIPT__PLANKTON;
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CFmaScene::init() void CFmaScene::init()
{ {
// if (s_chosenScript==FMA_SCRIPT__INTRO)
{ // Put up loading screen
CLevel::DisplayLoadingScreen();
}
int i; int i;
ACTOR_DATA *actor; ACTOR_DATA *actor;
CLevel::DisplayLoadingScreen(-2);
m_level=NULL; m_level=NULL;
m_party=NULL; m_party=NULL;

41
source/level/level.cpp
View file

@ -175,14 +175,13 @@ int PretendToBeAPS2=false;
}; };
const int LvlTableSize=sizeof(LvlTable)/sizeof(sLvlTab); const int LvlTableSize=sizeof(LvlTable)/sizeof(sLvlTab);
const FileEquate loadingScreens[7]= const FileEquate loadingScreens[6]=
{ {
LOADINGSCREENS_PINEAPPLE_GFX, // Chapter 1 LOADINGSCREENS_PINEAPPLE_GFX, // Chapter 1
LOADINGSCREENS_CULTURE_GFX, // Chapter 2 LOADINGSCREENS_CULTURE_GFX, // Chapter 2
LOADINGSCREENS_PICKLES_GFX, // Chapter 3 LOADINGSCREENS_PICKLES_GFX, // Chapter 3
LOADINGSCREENS_MONITOR_GFX, // Chapter 4 LOADINGSCREENS_MONITOR_GFX, // Chapter 4
LOADINGSCREENS_KARATE_GFX, // Chapter 5 LOADINGSCREENS_KARATE_GFX, // Chapter 5
LOADINGSCREENS_PIZZA_GFX, // Fma
}; };
/*****************************************************************************/ /*****************************************************************************/
@ -291,8 +290,16 @@ u8 *s_image;
int i; int i;
if (LevelNo==-1) if (LevelNo==-1)
{ // default loading screen {
s_image=LoadPakScreen(LOADINGSCREENS_BOOTSCREEN_GFX); // default loading screen
s_image=LoadPakScreen(LOADINGSCREENS_TEENAGE_GFX);
sprintf(buf,"%s",TranslationDatabase::getString(STR__NOW_LOADING));
}
else if (LevelNo==-2)
{
// fma laoding screen..
s_image=LoadPakScreen( LOADINGSCREENS_PIZZA_GFX);
sprintf(buf,"%s",TranslationDatabase::getString(STR__NOW_LOADING));
} }
else else
{ {
@ -309,20 +316,18 @@ int i;
for(i=0;i<2;i++) for(i=0;i<2;i++)
{ {
if (LevelNo!=-1) font.setColour(255,255,255);
{ font.print(256 ,90 ,buf);
font.setColour(255,255,255); font.setColour(0,0,0);
font.print(256 ,90 ,buf); font.print(256-1,90-1,buf);
font.setColour(0,0,0); font.print(256-1,90 ,buf);
font.print(256-1,90-1,buf); font.print(256-1,90+1,buf);
font.print(256-1,90 ,buf); font.print(256 ,90-1,buf);
font.print(256-1,90+1,buf); font.print(256 ,90+1,buf);
font.print(256 ,90-1,buf); font.print(256+1,90-1,buf);
font.print(256 ,90+1,buf); font.print(256+1,90 ,buf);
font.print(256+1,90-1,buf); font.print(256+1,90+1,buf);
font.print(256+1,90 ,buf);
font.print(256+1,90+1,buf);
}
PrimDisplay(); PrimDisplay();
VSync(0); VSync(0);
VidSwapDraw(); VidSwapDraw();