zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Paul 2001-04-25 18:15:19 +00:00
parent f29a89e2dd
commit 129f920240
7 changed files with 196 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/frontend/frontend.cpp
View file

@ -66,8 +66,8 @@
#include "Dstructs.h"
#endif
#ifndef __GAME_GAME_H__
#include "game\game.h"
#ifndef __MAP_MAP_H__
#include "map\map.h"
#endif
@ -284,10 +284,10 @@ void CFrontEndScene::setMode(FrontEndMode _newMode)
}
// Open new mode
if(_newMode==MODE__EXIT_TO_GAME)
if(_newMode==MODE__EXIT_TO_MAP)
{
m_exitToGame=true;
GameState::setNextScene(&GameScene);
GameState::setNextScene(&MapScene);
}
else

2
source/frontend/frontend.h
View file

@ -56,7 +56,7 @@ public:
MODE__NONE,
MODE__EXIT_TO_GAME,
MODE__EXIT_TO_MAP,
} FrontEndMode;
enum

15
source/frontend/start.cpp
View file

@ -167,7 +167,9 @@ void CFrontEndStart::render()
setRGB3(g4,50, 0,50);
AddPrimToList(g4,MAX_OT-1);
#if 0
m_guiFrame->render();
#endif
}
/*----------------------------------------------------------------------
@ -178,6 +180,7 @@ void CFrontEndStart::render()
---------------------------------------------------------------------- */
void CFrontEndStart::think(int _frames)
{
#if 0
if(!CFader::isFading())
{
m_guiFrame->think(_frames);
@ -195,6 +198,7 @@ void CFrontEndStart::think(int _frames)
CFader::setFadingOut();
}
}
#endif
}
/*----------------------------------------------------------------------
@ -205,7 +209,7 @@ void CFrontEndStart::think(int _frames)
---------------------------------------------------------------------- */
int CFrontEndStart::isReadyToExit()
{
return !CFader::isFading()&&m_shuttingDown;
return !CFader::isFading();
}
/*----------------------------------------------------------------------
@ -216,14 +220,7 @@ int CFrontEndStart::isReadyToExit()
---------------------------------------------------------------------- */
CFrontEndScene::FrontEndMode CFrontEndStart::getNextMode()
{
if(m_selectedSlot==NO_SLOT_SELECTED)
{
return CFrontEndScene::MODE__MAIN_TITLES;
}
else
{
return CFrontEndScene::MODE__EXIT_TO_GAME;
}
return CFrontEndScene::MODE__EXIT_TO_MAP;
}
/*===========================================================================