From 7de947bfc20edbf035c11acadf54b1aded535fb2 Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Tue, 10 Jul 2001 14:43:20 +0000
Subject: [PATCH]

---
 data/translations/text.dat | 14 ++++----------
 source/backend/credits.cpp |  3 ++-
 source/map/map.cpp         |  1 +
 source/save/save.cpp       | 18 +++++++++++++++++-
 source/save/save.h         | 23 +++++++++++++++++------
 source/shop/shop.cpp       |  9 +++++----
 6 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/data/translations/text.dat b/data/translations/text.dat
index 2a12a9b34..5bf2485c0 100644
--- a/data/translations/text.dat
+++ b/data/translations/text.dat
@@ -769,16 +769,10 @@ eng=Carolina Beroza
 eng=Michael Rubinelli
 [STR__CREDITS__JEREMY_BARNES]
 eng=Jeremy Barnes
-[STR__CREDITS__TBD]
-eng=TBD
-[STR__CREDITS__TBD]
-eng=TBD
-[STR__CREDITS__TBD]
-eng=TBD
-[STR__CREDITS__TBD]
-eng=TBD
-[STR__CREDITS__TBD]
-eng=TBD
+[STR__CREDITS__IAN_SEDENSKY]
+eng=Ian Sedensky
+[STR__CREDITS__CHUCK_SHEFFIELD]
+eng=Chuck Sheffield
 [STR__CREDITS__TBD]
 eng=TBD
 [STR__CREDITS__THQ_AND_THE_THQ_LOGO_ARE_TRADEMARKS_AND_OR_REGISTERED_TRADEMARKS_OF_THQ_INC]
diff --git a/source/backend/credits.cpp b/source/backend/credits.cpp
index 1aec89ae9..484fd96fb 100644
--- a/source/backend/credits.cpp
+++ b/source/backend/credits.cpp
@@ -203,7 +203,8 @@ static u16	s_creditData[]=
 	CC_NAME,		STR__CREDITS__TBD,
 	CC_BLANK_LINE,
 	CC_TITLE,		STR__CREDITS__TESTERS,
-	CC_NAME,		STR__CREDITS__TBD,
+	CC_NAME,		STR__CREDITS__IAN_SEDENSKY,
+	CC_NAME,		STR__CREDITS__CHUCK_SHEFFIELD,
 	CC_END_OF_PAGE,
 
 	CC_TITLE,		STR__CREDITS__PRODUCT_MANAGER,
diff --git a/source/map/map.cpp b/source/map/map.cpp
index 07cdea517..f001f7865 100644
--- a/source/map/map.cpp
+++ b/source/map/map.cpp
@@ -469,6 +469,7 @@ void CMapScene::think(int _frames)
 			CSoundMediator::playSfx(CSoundMediator::SFX_FRONT_END__OK);
 			m_readyToExit=true;
 			CFader::setFadingOut();
+			CSaveScene::setNextScene(CSaveScene::NEXTSCENE_MAP);
 			GameState::setNextScene(&SaveScene);
 		}
 	}
diff --git a/source/save/save.cpp b/source/save/save.cpp
index f9090f4c6..e2ad7da79 100644
--- a/source/save/save.cpp
+++ b/source/save/save.cpp
@@ -54,6 +54,10 @@
 #include "map\map.h"
 #endif
 
+#ifndef __BACKEND_PARTY_H__
+#include "backend\party.h"
+#endif
+
 
 /*	Std Lib
 	------- */
@@ -84,6 +88,7 @@
 
 CSaveScene	SaveScene;
 
+CSaveScene::NEXTSCENE		CSaveScene::s_nextScene=CSaveScene::NEXTSCENE_MAP;
 
 static const int	NORMAL__FRAME_W=416;
 static const int	NORMAL__FRAME_H=160;
@@ -547,7 +552,16 @@ void CSaveScene::setMode(MODE _newMode)
 			break;
 
 		case MODE__READYTOEXIT:
-			GameState::setNextScene(&MapScene);
+			switch(s_nextScene)
+			{
+				case NEXTSCENE_MAP:
+					GameState::setNextScene(&MapScene);
+					break;
+				case NEXTSCENE_PARTY:
+					GameState::setNextScene(&FmaScene);
+					CFmaScene::selectFma(CFmaScene::FMA_SCRIPT__PARTY);
+					break;
+			}
 			break;
 	}
 
@@ -558,6 +572,7 @@ void CSaveScene::setMode(MODE _newMode)
 
 
 //////////
+#ifdef __USER_paul__
 static const char *text[]=
 {
 		"MODE__CONFIRMSAVE",
@@ -576,6 +591,7 @@ static const char *text[]=
 		"MODE__READYTOEXIT",
 };
 PAUL_DBGMSG("newmode: %s",text[m_mode]);
+#endif
 //////////
 }
 
diff --git a/source/save/save.h b/source/save/save.h
index d77ba4071..f9e3efe7e 100644
--- a/source/save/save.h
+++ b/source/save/save.h
@@ -37,12 +37,21 @@
 class CSaveScene: public CScene
 {
 public:
-	void	init();
-	void	shutdown();
-	void	render();
-	void	think(int _frames);
-	int		readyToShutdown();
-	char	*getSceneName()			{return"Save";}
+	typedef enum
+	{
+		NEXTSCENE_MAP,
+		NEXTSCENE_PARTY,
+	}NEXTSCENE;
+
+
+	void			init();
+	void			shutdown();
+	void			render();
+	void			think(int _frames);
+	int				readyToShutdown();
+	char			*getSceneName()					{return"Save";}
+
+	static void		setNextScene(NEXTSCENE _next)	{s_nextScene=_next;}
 
 
 private:
@@ -87,6 +96,8 @@ private:
 	int						m_timeInMode;
 	int						m_userResponse;
 
+	static NEXTSCENE		s_nextScene;
+
 };
 
 
diff --git a/source/shop/shop.cpp b/source/shop/shop.cpp
index 57edce6ed..53b67c731 100644
--- a/source/shop/shop.cpp
+++ b/source/shop/shop.cpp
@@ -78,8 +78,8 @@
 #include "gui\pointer.h"
 #endif
 
-#ifndef	__FMA_FMA_H__
-#include "fma\fma.h"
+#ifndef	__SAVE_SAVE_H__
+#include "save\save.h"
 #endif
 
 
@@ -410,9 +410,10 @@ void CShopScene::think(int _frames)
 			CFader::setFadingOut();
 			if(s_gotoPartyScreen)
 			{
+				// Go to save screen, followed by party screen
 				s_gotoPartyScreen=false;
-				CFmaScene::selectFma(CFmaScene::FMA_SCRIPT__PARTY);
-				GameState::setNextScene(&FmaScene);
+				CSaveScene::setNextScene(CSaveScene::NEXTSCENE_PARTY);
+				GameState::setNextScene(&SaveScene);
 			}
 			else
 			{