From 61ce128d677d466ba7d729591c4928c1fdb1678e Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Thu, 2 Aug 2001 15:46:19 +0000
Subject: [PATCH]

---
 source/fma/fma.cpp   |  9 +++++++--
 source/game/game.cpp | 10 ++++++----
 source/shop/shop.cpp | 31 +------------------------------
 source/shop/shop.h   |  2 --
 4 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/source/fma/fma.cpp b/source/fma/fma.cpp
index 2a1c1d848..47fd12f42 100644
--- a/source/fma/fma.cpp
+++ b/source/fma/fma.cpp
@@ -82,6 +82,10 @@ FX
 #include "game\game.h"
 #endif
 
+#ifndef __SAVE_SAVE_H__
+#include "save\save.h"
+#endif
+
 
 
 /*	Std Lib
@@ -185,6 +189,7 @@ enum
 	FMA_NEXT_SCENE_GAME,
 	FMA_NEXT_SCENE_CREDITS,
 	FMA_NEXT_SCENE_FMA,
+	FMA_NEXT_SCENE_SAVE,
 
 	FMA_NUM_NEXT_SCENES
 };
@@ -332,6 +337,7 @@ static CScene	*s_nextGameSceneTable[FMA_NUM_NEXT_SCENES]=
 	&GameScene,					// FMA_NEXT_SCENE_GAME
 	&CreditsScene,				// FMA_NEXT_SCENE_CREDITS
 	&FmaScene,					// FMA_NEXT_SCENE_FMA
+	&SaveScene,					// FMA_NEXT_SCENE_SAVE
 };
 
 
@@ -946,8 +952,7 @@ static const int s_FMAC5EndScript[]=
 	SC_REGISTER_CONVERSATION,	SCRIPTS_FMA_CH6_02_DAT,
 	SC_REGISTER_CONVERSATION,	SCRIPTS_FMA_CH6_03_DAT,
 	SC_USE_LEVEL,				25,
-	SC_SET_NEXT_SCENE,			FMA_NEXT_SCENE_FMA,
-	SC_SET_NEXT_FMA_NUMBER,		CFmaScene::FMA_SCRIPT__PARTY,
+	SC_SET_NEXT_SCENE,			FMA_NEXT_SCENE_SAVE,
 	SC_START,
 
 // Scene 1 - Shade Shoals
diff --git a/source/game/game.cpp b/source/game/game.cpp
index 85a805d35..b96219ffa 100644
--- a/source/game/game.cpp
+++ b/source/game/game.cpp
@@ -103,6 +103,9 @@
 #include "locale\textdbase.h"
 #endif
 
+#ifndef	__SAVE_SAVE_H__
+#include "save\save.h"
+#endif
 
 #include "gfx\actor.h"
 
@@ -597,13 +600,12 @@ void CGameScene::think_playing(int _frames)
 		{
 			FmaScene.selectFma(fma);
 			GameState::setNextScene(&FmaScene);
+
+			// After the last FMA it goes to save. We then need to make it go to PARTY
+			SaveScene.setNextScene(CSaveScene::NEXTSCENE_PARTY);
 		}
 		else if(level==5)
 		{
-			if(chapter==5)
-			{
-				ShopScene.setGotoPartyScreen();
-			}
 			GameState::setNextScene(&ShopScene);
 		}
 		else
diff --git a/source/shop/shop.cpp b/source/shop/shop.cpp
index 5aa92403f..ebf08f9b8 100644
--- a/source/shop/shop.cpp
+++ b/source/shop/shop.cpp
@@ -78,10 +78,6 @@
 #include "gui\pointer.h"
 #endif
 
-#ifndef	__SAVE_SAVE_H__
-#include "save\save.h"
-#endif
-
 
 /*	Std Lib
 	------- */
@@ -135,8 +131,6 @@ xmPlayingId	s_playId;
 
 CShopScene	ShopScene;
 
-static int	s_gotoPartyScreen=false;
-
 
 /*----------------------------------------------------------------------
 	Function:
@@ -408,17 +402,7 @@ void CShopScene::think(int _frames)
 		{
 			m_readyToExit=true;
 			CFader::setFadingOut();
-			if(s_gotoPartyScreen)
-			{
-				// Go to save screen, followed by party screen
-				s_gotoPartyScreen=false;
-				CSaveScene::setNextScene(CSaveScene::NEXTSCENE_PARTY);
-				GameState::setNextScene(&SaveScene);
-			}
-			else
-			{
-				GameState::setNextScene(&MapScene);
-			}
+			GameState::setNextScene(&MapScene);
 		}
 	
 		m_guiFrame->think(_frames);
@@ -486,19 +470,6 @@ int CShopScene::readyToShutdown()
 }
 
 
-/*----------------------------------------------------------------------
-	Function:
-	Purpose:	Makes the game go to the party scene rather than the map
-				scene after the shop has been exited
-	Params:
-	Returns:
-  ---------------------------------------------------------------------- */
-void CShopScene::setGotoPartyScreen()
-{
-	s_gotoPartyScreen=true;
-}
-
-
 /*----------------------------------------------------------------------
 	Function:
 	Purpose:	Ugh... I *really* hope this works ok with all languages, otherwise
diff --git a/source/shop/shop.h b/source/shop/shop.h
index 3b76f63b8..d406d7e02 100644
--- a/source/shop/shop.h
+++ b/source/shop/shop.h
@@ -48,8 +48,6 @@ public:
 	int		readyToShutdown();
 	char	*getSceneName()			{return"Shop";}
 
-	static void		setGotoPartyScreen();
-
 	typedef enum
 	{
 		SHOPITEM_TEDDY,