This commit is contained in:
parent
4eaf0f7ab2
commit
e8512d179f
4 changed files with 28 additions and 23 deletions
|
@ -123,6 +123,7 @@ loadingscreens/monitor.gfx
|
|||
loadingscreens/pickles.gfx
|
||||
loadingscreens/pineapple.gfx
|
||||
loadingscreens/pizza.gfx
|
||||
loadingscreens/teenage.gfx
|
||||
loadingscreens/bootscreen.gfx
|
||||
memcard/memhead.bin
|
||||
ui/map/map_background.gfx
|
||||
|
|
|
@ -516,7 +516,7 @@ GFX_DATA_OUT += $(MAPSCREENS_OUT)
|
|||
# Loading screens
|
||||
#----------------------------------------------------------------------------
|
||||
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 := $(foreach SCREEN,$(LOADINGSCREENS_IN),$(LOADINGSCREENS_OUT_DIR)/$(SCREEN).gfx)
|
||||
|
|
|
@ -1201,13 +1201,12 @@ int s_chosenScript=CFmaScene::FMA_SCRIPT__PLANKTON;
|
|||
---------------------------------------------------------------------- */
|
||||
void CFmaScene::init()
|
||||
{
|
||||
// if (s_chosenScript==FMA_SCRIPT__INTRO)
|
||||
{ // Put up loading screen
|
||||
CLevel::DisplayLoadingScreen();
|
||||
}
|
||||
int i;
|
||||
ACTOR_DATA *actor;
|
||||
|
||||
|
||||
CLevel::DisplayLoadingScreen(-2);
|
||||
|
||||
m_level=NULL;
|
||||
m_party=NULL;
|
||||
|
||||
|
|
|
@ -175,14 +175,13 @@ int PretendToBeAPS2=false;
|
|||
};
|
||||
const int LvlTableSize=sizeof(LvlTable)/sizeof(sLvlTab);
|
||||
|
||||
const FileEquate loadingScreens[7]=
|
||||
const FileEquate loadingScreens[6]=
|
||||
{
|
||||
LOADINGSCREENS_PINEAPPLE_GFX, // Chapter 1
|
||||
LOADINGSCREENS_CULTURE_GFX, // Chapter 2
|
||||
LOADINGSCREENS_PICKLES_GFX, // Chapter 3
|
||||
LOADINGSCREENS_MONITOR_GFX, // Chapter 4
|
||||
LOADINGSCREENS_KARATE_GFX, // Chapter 5
|
||||
LOADINGSCREENS_PIZZA_GFX, // Fma
|
||||
};
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -291,8 +290,16 @@ u8 *s_image;
|
|||
int i;
|
||||
|
||||
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
|
||||
{
|
||||
|
@ -308,8 +315,6 @@ int i;
|
|||
font.setScale(370);
|
||||
|
||||
for(i=0;i<2;i++)
|
||||
{
|
||||
if (LevelNo!=-1)
|
||||
{
|
||||
font.setColour(255,255,255);
|
||||
font.print(256 ,90 ,buf);
|
||||
|
@ -322,7 +327,7 @@ int i;
|
|||
font.print(256+1,90-1,buf);
|
||||
font.print(256+1,90 ,buf);
|
||||
font.print(256+1,90+1,buf);
|
||||
}
|
||||
|
||||
PrimDisplay();
|
||||
VSync(0);
|
||||
VidSwapDraw();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue