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

View File

@ -50,8 +50,6 @@ eng=PRESS START
eng=START GAME
[STR__FRONTEND__OPTIONS]
eng=OPTIONS
[STR__FRONTEND__CREDITS]
eng=CREDITS
; Options menu
[STR__FRONTEND__CONTROLS]

View File

@ -48,8 +48,9 @@ CD_FILESYS_LIB := CMXBoot
# Source Code to Compile
#----------------------------------------------------------------------------
backend_src := gameover \
complete \
backend_src := complete \
credits \
gameover \
party
enemy_src := npc \
@ -185,8 +186,7 @@ projectl_src := projectl \
fileio_src := fileio \
$($(FILE_SYSTEM)_FILESYS_SRC)
frontend_src := credits \
demomode \
frontend_src := demomode \
frontend \
fmvthq \
fmvintro \

View File

@ -22,7 +22,7 @@
Includes
-------- */
#include "frontend\credits.h"
#include "backend\credits.h"
#ifndef __GFX_SPRBANK_H__
#include "gfx\sprbank.h"
@ -60,6 +60,9 @@
#include "sound\sound.h"
#endif
#ifndef __FRONTEND_FRONTEND_H__
#include "frontend\frontend.h"
#endif
/* Std Lib
------- */
@ -236,6 +239,8 @@ int TITLE_FONT_SIZE=384;
int NAME_FONT_SIZE=256;
int DELAY_TIME=4*60;
CCreditsScene CreditsScene;
/*----------------------------------------------------------------------
@ -251,7 +256,7 @@ CSaveLoadDatabase *sl;
enum{mode_none,mode_save,mode_load};
int mode=mode_none;
#endif
void CFrontEndCredits::init()
void CCreditsScene::init()
{
#ifdef MEM_CARD_TEST
MemCard::Start();
@ -302,7 +307,7 @@ mode=mode_none;
Params:
Returns:
---------------------------------------------------------------------- */
void CFrontEndCredits::shutdown()
void CCreditsScene::shutdown()
{
#ifdef MEM_CARD_TEST
MemCard::Stop();
@ -325,7 +330,7 @@ delete sl;
Params:
Returns:
---------------------------------------------------------------------- */
void CFrontEndCredits::render()
void CCreditsScene::render()
{
renderCreditsListTillEndOfPage(m_currentPage);
m_background1->render();
@ -341,7 +346,7 @@ void CFrontEndCredits::render()
int creditsfr=40;
int creditsfg=80;
int creditsfb=127;
void CFrontEndCredits::think(int _frames)
void CCreditsScene::think(int _frames)
{
#ifdef MEM_CARD_TEST
sl->think();
@ -434,6 +439,7 @@ else if(mode==mode_load)
{
m_shuttingDown=true;
CFader::setFadingOut();
GameState::setNextScene(&FrontEndScene);
}
}
@ -447,7 +453,7 @@ else if(mode==mode_load)
Params:
Returns:
---------------------------------------------------------------------- */
int CFrontEndCredits::isReadyToExit()
int CCreditsScene::readyToShutdown()
{
return !CFader::isFading()&&m_shuttingDown;
}
@ -458,18 +464,7 @@ int CFrontEndCredits::isReadyToExit()
Params:
Returns:
---------------------------------------------------------------------- */
CFrontEndScene::FrontEndMode CFrontEndCredits::getNextMode()
{
return CFrontEndScene::MODE__MAIN_TITLES;
}
/*----------------------------------------------------------------------
Function:
Purpose:
Params:
Returns:
---------------------------------------------------------------------- */
void CFrontEndCredits::renderCreditsListTillEndOfPage(u16 *_list)
void CCreditsScene::renderCreditsListTillEndOfPage(u16 *_list)
{
int y;
int mode;

View File

@ -18,8 +18,8 @@
Includes
-------- */
#ifndef __FRONTEND_FRONTEND_H__
#include "frontend\frontend.h"
#ifndef __SYSTEM_GSTATE_H__
#include "system\gstate.h"
#endif
#ifndef _GLOBAL_HEADER_
@ -38,19 +38,15 @@
Structure defintions
-------------------- */
class CFrontEndCredits : public CFrontEndMode
class CCreditsScene : public CScene
{
public:
void init();
void shutdown();
void select();
void unselect();
void render();
void think(int _frames);
int isReadyToExit();
CFrontEndScene::FrontEndMode getNextMode();
int readyToShutdown();
char *getSceneName() {return"Credits";}
private:
void renderCreditsListTillEndOfPage(u16 *_list);
@ -74,6 +70,9 @@ private:
Globals
------- */
extern CCreditsScene CreditsScene;
/*----------------------------------------------------------------------
Functions
--------- */

View File

@ -182,7 +182,6 @@ void CGameOverScene::think(int _frames)
case STATE__EXITING_TO_FRONT_END:
break;
}
PAUL_DBGMSG("%d",m_state);
}

View File

@ -58,8 +58,8 @@
#include "gfx\actor.h"
#endif
#ifndef __FRONTEND_FRONTEND_H__
#include "frontend\frontend.h"
#ifndef __BACKEND_CREDITS_H__
#include "backend\credits.h"
#endif
#ifndef __MATHTABLE_HEADER__
@ -314,7 +314,7 @@ void CPartyScene::think(int _frames)
{
m_readyToExit=true;
CFader::setFadingOut();
GameState::setNextScene(&FrontEndScene);
GameState::setNextScene(&CreditsScene);
}
}

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

View File

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

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;

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;

View File

@ -67,6 +67,11 @@
#include "backend\party.h"
#endif
#ifndef __BACKEND_CREDITS_H__
#include "backend\credits.h"
#endif
/* Std Lib
------- */
@ -104,6 +109,7 @@ CScene *CSceneSelector::s_sceneList[]=
&MapScene,
&ShopScene,
&PartyScene,
&CreditsScene,
};
int CSceneSelector::s_sceneCount=sizeof(s_sceneList)/sizeof(CScene*);
@ -161,7 +167,7 @@ void CSceneSelector::render()
AddPrimToList(f4,15);
m_font->setColour(255,255,255);
m_font->print(256,80,"Select scene:");
m_font->print(256,50,"Select scene:");
for(i=0;i<s_sceneCount;i++)
{
if(i==m_currentSelection)
@ -172,7 +178,7 @@ void CSceneSelector::render()
{
m_font->setColour(255,100,100);
}
m_font->print(256,110+(i*m_font->getCharHeight()),s_sceneList[i]->getSceneName());
m_font->print(256,80+(i*m_font->getCharHeight()),s_sceneList[i]->getSceneName());
}
}
}

View File

@ -97,6 +97,14 @@ SOURCE=..\..\..\source\backend\complete.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\backend\credits.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\source\backend\credits.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\backend\gameover.cpp
# End Source File
# Begin Source File
@ -553,14 +561,6 @@ SOURCE=..\..\..\source\fmv\fmv.h
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\source\frontend\credits.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\source\frontend\credits.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\frontend\demomode.cpp
# End Source File
# Begin Source File