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-06-19 21:26:50 +00:00
parent f1fd2a9089
commit 126ef0af87
12 changed files with 46 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

6
source/frontend/frontend.cpp
View file

@ -46,10 +46,6 @@
#include "frontend\demomode.h"
#endif
#ifndef __FRONTEND_CREDITS_H__
#include "frontend\credits.h"
#endif
#ifndef __GFX_SPRBANK_H__
#include "gfx\sprbank.h"
#endif
@ -108,7 +104,6 @@ static CFrontEndMainTitles s_frontEndModeMainTitles;
static CFrontEndOptions s_frontEndModeOptions;
static CFrontEndStart s_frontEndStart;
static CFrontEndDemoMode s_frontEndDemoMode;
static CFrontEndCredits s_frontEndCredits;
CFrontEndMode *CFrontEndScene::s_modeCodes[]=
{
@ -118,7 +113,6 @@ CFrontEndMode *CFrontEndScene::s_modeCodes[]=
&s_frontEndModeOptions, // MODE__GAME_OPTIONS
&s_frontEndStart, // MODE__CHOOSE_SLOT
&s_frontEndDemoMode, // MODE__DEMO
&s_frontEndCredits, // MODE__CREDITS
// NULL, // MODE__NONE
// NULL, // MODE__EXIT_TO_GAME

1
source/frontend/frontend.h
View file

@ -52,7 +52,6 @@ public:
MODE__GAME_OPTIONS,
MODE__CHOOSE_SLOT,
MODE__DEMO,
MODE__CREDITS,
MODE__NONE,

19
source/frontend/maintitl.cpp
View file

@ -131,7 +131,7 @@ void CFrontEndMainTitles::init()
m_smallFont->setJustification(FontBank::JUST_CENTRE);
m_smallFont->setOt(5);
// Create the main menu ( START GAME/OPTIONS/CREDITS )
// Create the main menu ( START GAME/OPTIONS )
m_mainMenu=new ("Main Menu GUI") CGUIControlFrame();
m_mainMenu->init(NULL);
m_mainMenu->setObjectXYWH(106,145,300,60);
@ -145,10 +145,6 @@ void CFrontEndMainTitles::init()
50,20,200,20,
STR__FRONTEND__OPTIONS,
&m_gotoOptionsFlag,true);
CGUIFactory::createValueButtonFrame(m_mainMenu,
50,40,200,20,
STR__FRONTEND__CREDITS,
&m_gotoCreditsFlag,true);
}
/*----------------------------------------------------------------------
@ -184,7 +180,6 @@ void CFrontEndMainTitles::select()
m_startGameFlag=false;
m_gotoOptionsFlag=false;
m_gotoCreditsFlag=false;
m_demoTimeout=0;
@ -306,12 +301,6 @@ void CFrontEndMainTitles::think(int _frames)
m_mode=MODE__GOTO_OPTIONS;
m_mainMenu->unselect();
}
else if(m_gotoCreditsFlag)
{
CFader::setFadingOut();
m_mode=MODE__GOTO_CREDITS;
m_mainMenu->unselect();
}
break;
default:
@ -349,7 +338,7 @@ void CFrontEndMainTitles::think(int _frames)
---------------------------------------------------------------------- */
int CFrontEndMainTitles::isReadyToExit()
{
return !CFader::isFading()&&(m_mode==MODE__GOTO_CHOOSE_SLOT||m_mode==MODE__GOTO_OPTIONS||m_mode==MODE__GOTO_DEMO||m_mode==MODE__GOTO_CREDITS);
return !CFader::isFading()&&(m_mode==MODE__GOTO_CHOOSE_SLOT||m_mode==MODE__GOTO_OPTIONS||m_mode==MODE__GOTO_DEMO);
}
@ -382,10 +371,6 @@ CFrontEndScene::FrontEndMode CFrontEndMainTitles::getNextMode()
case MODE__GOTO_DEMO:
ret=CFrontEndScene::MODE__DEMO;
break;
case MODE__GOTO_CREDITS:
ret=CFrontEndScene::MODE__CREDITS;
break;
}
return ret;

2
source/frontend/maintitl.h
View file

@ -77,7 +77,6 @@ private:
MODE__GOTO_CHOOSE_SLOT,
MODE__GOTO_OPTIONS,
MODE__GOTO_DEMO,
MODE__GOTO_CREDITS,
};
enum
@ -101,7 +100,6 @@ private:
int m_startGameFlag;
int m_gotoOptionsFlag;
int m_gotoCreditsFlag;
int m_demoTimeout;
int m_musicStarted;