Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Paul 2001-01-05 21:33:06 +00:00
parent 599abe1c20
commit e1fee5042d
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/frontend/frontend.cpp
View File

@ -58,6 +58,14 @@
#include "sound\sound.h" #include "sound\sound.h"
#endif #endif
#ifndef __DATA_STRUCTS_HEADER__
#include "Dstructs.h"
#endif
#ifndef __GAME_GAME_H__
#include "game\game.h"
#endif
/* Std Lib /* Std Lib
------- */ ------- */
@ -259,7 +267,8 @@ void CFrontEndScene::setMode(FrontEndMode _newMode)
if(_newMode==MODE__EXIT_TO_GAME) if(_newMode==MODE__EXIT_TO_GAME)
{ {
m_exitToGame=true; m_exitToGame=true;
GameState::setNextScene(&FrontEndScene); GameState::setNextScene(&GameScene);
} }
else else
{ {

14
source/system/gstate.cpp
View File

@ -78,44 +78,44 @@ void GameState::think()
{ {
if(s_currentScene->readyToShutdown()) if(s_currentScene->readyToShutdown())
{ {
SYSTEM_DBGMSG("GameState: Closing down scene.."); SYSTEM_DBGMSG("GameState: Closing down scene '%s'..",s_currentScene->getSceneName());
#ifdef __VERSION_DEBUG__ #ifdef __VERSION_DEBUG__
int gain; int gain;
gain=MainRam.RamUsed-s_baseSceneMemory; gain=MainRam.RamUsed-s_baseSceneMemory;
if(gain) if(gain)
{ {
SYSTEM_DBGMSG("Scene allocated an extra %d bytes after init()",gain); SYSTEM_DBGMSG("Scene '%s' allocated an extra %d bytes after init()",s_currentScene->getSceneName(),gain);
} }
#endif #endif
ASSERT(s_pendingScene); // There really should be a scene pending before you shutdown..! ASSERT(s_pendingScene); // There really should be a scene pending before you shutdown..!
s_currentScene->shutdown(); s_currentScene->shutdown();
s_currentScene=NULL;
#ifdef __VERSION_DEBUG__ #ifdef __VERSION_DEBUG__
int loss; int loss;
loss=MainRam.RamUsed-s_baseMemory; loss=MainRam.RamUsed-s_baseMemory;
if(loss) if(loss)
{ {
SYSTEM_DBGMSG("MEMORY HAS CHANGED BY %d BYTES DURING SCENE!",loss); SYSTEM_DBGMSG("MEMORY HAS CHANGED BY %d BYTES DURING SCENE '%s'!",loss,s_currentScene->getSceneName());
ASSERT(0); ASSERT(0);
s_baseMemory=0; s_baseMemory=0;
} }
#endif #endif
s_currentScene=NULL;
} }
} }
if(!s_currentScene) if(!s_currentScene)
{ {
s_currentScene=s_pendingScene;
#ifdef __VERSION_DEBUG__ #ifdef __VERSION_DEBUG__
if(s_baseMemory==0) if(s_baseMemory==0)
{ {
s_baseMemory=MainRam.RamUsed; s_baseMemory=MainRam.RamUsed;
} }
SYSTEM_DBGMSG("GameState: Opening new scene ( with %d bytes used )",s_baseMemory); SYSTEM_DBGMSG("GameState: Opening new scene '%s' ( with %d bytes used )",s_currentScene->getSceneName(),s_baseMemory);
#endif #endif
s_currentScene=s_pendingScene;
s_currentScene->init(); s_currentScene->init();
#ifdef __VERSION_DEBUG__ #ifdef __VERSION_DEBUG__
s_baseSceneMemory=MainRam.RamUsed; s_baseSceneMemory=MainRam.RamUsed;
SYSTEM_DBGMSG("GameState: Scene has used %d bytes during init()",s_baseSceneMemory-s_baseMemory); SYSTEM_DBGMSG("GameState: Scene '%s' has used %d bytes during init()",s_currentScene->getSceneName(),s_baseSceneMemory-s_baseMemory);
#endif #endif
s_pendingScene=NULL; s_pendingScene=NULL;
} }