From e8512d179f13eeb81b189e5bcf1fda02dce4ba81 Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Tue, 7 Aug 2001 15:41:47 +0000
Subject: [PATCH]

---
 data/DataCache.scr     |  1 +
 makefile.gfx           |  2 +-
 source/fma/fma.cpp     |  7 +++----
 source/level/level.cpp | 41 +++++++++++++++++++++++------------------
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/data/DataCache.scr b/data/DataCache.scr
index 6668df154..8693abc4d 100644
--- a/data/DataCache.scr
+++ b/data/DataCache.scr
@@ -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
diff --git a/makefile.gfx b/makefile.gfx
index 90f9f7d55..5e8706996 100644
--- a/makefile.gfx
+++ b/makefile.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)
diff --git a/source/fma/fma.cpp b/source/fma/fma.cpp
index a8d0eabab..ead89ecc3 100644
--- a/source/fma/fma.cpp
+++ b/source/fma/fma.cpp
@@ -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;
 
diff --git a/source/level/level.cpp b/source/level/level.cpp
index 3118e3f97..6f3aa2ce1 100644
--- a/source/level/level.cpp
+++ b/source/level/level.cpp
@@ -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
 			{
@@ -309,20 +316,18 @@ int					i;
 
 			for(i=0;i<2;i++)
 			{
-				if (LevelNo!=-1)
-				{
-					font.setColour(255,255,255);
-					font.print(256  ,90  ,buf);
-					font.setColour(0,0,0);
-					font.print(256-1,90-1,buf);
-					font.print(256-1,90  ,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+1,90  ,buf);
-					font.print(256+1,90+1,buf);
-					}
+				font.setColour(255,255,255);
+				font.print(256  ,90  ,buf);
+				font.setColour(0,0,0);
+				font.print(256-1,90-1,buf);
+				font.print(256-1,90  ,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+1,90  ,buf);
+				font.print(256+1,90+1,buf);
+
 				PrimDisplay();
 				VSync(0);
 				VidSwapDraw();