source/game/game.cpp

@@ -110,3 +110,9 @@ void	CGameScene::think(int _frames)
 }
 
 /*****************************************************************************/
+int		CGameScene::readyToShutdown()
+{
+	return false;
+}
+
+/*****************************************************************************/

source/game/game.h

@@ -18,11 +18,12 @@ public:
 	virtual ~CGameScene()	{;}
 
 
-	void init();
+	void	init();
-	void shutdown();
+	void	shutdown();
-	void render();
+	void	render();
-	void think(int _frames);
+	void	think(int _frames);
-	char *getSceneName()	{return "Game";}
+	int		readyToShutdown();
+	char	*getSceneName()	{return "Game";}
 
 	
 private:

source/paul/paul.h

@@ -36,11 +36,12 @@
 class CPaulScene : public CScene
 {
 public:
-	void init();
+	void	init();
-	void shutdown();
+	void	shutdown();
-	void render();
+	void	render();
-	void think(int _frames);
+	void	think(int _frames);
-	char *getSceneName()			{return"PaulsScene";}
+	int		readyToShutdown()		{return false;}
+	char	*getSceneName()			{return"PaulsScene";}
 };
 
 

source/system/gstate.cpp

@@ -46,21 +46,26 @@ void GameState::think()
 {
 	updateTimer();
 
-	if( s_pendingScene )
+
+	if(s_pendingScene)
+	{
+		if(s_currentScene)
 		{
-		if( !s_currentScene)
+			if(s_currentScene->readyToShutdown())
 			{
-			if( s_currentScene )
+				ASSERT(s_pendingScene);		// There really should be a scene pending before you shutdown..!
-				{
 				s_currentScene->shutdown();
-				}
+				s_currentScene=NULL;
-
-			s_currentScene=s_pendingScene;
-			s_pendingScene=NULL;
-
-			s_currentScene->init();
 			}
 		}
+		if(!s_currentScene)
+		{
+			s_currentScene=s_pendingScene;
+			s_currentScene->init();
+			s_pendingScene=NULL;
+		}
+	}
+
 	ASSERT(s_currentScene);
 	s_currentScene->think(getFramesSinceLast());
 }

source/system/gstate.h

@@ -31,6 +31,7 @@ public:
 	virtual void	shutdown()=0;
 	virtual void	render()=0;
 	virtual void	think(int _frames)=0;
+	virtual int		readyToShutdown()=0;
 	virtual char	*getSceneName()=0;
 
 protected: