This commit is contained in:
Paul 2001-08-29 20:26:54 +00:00
parent 2d0b977738
commit 43a5f46265
9 changed files with 53 additions and 6 deletions

View File

@ -50,6 +50,8 @@ eng=PRESS START
eng=START GAME eng=START GAME
[STR__FRONTEND__OPTIONS] [STR__FRONTEND__OPTIONS]
eng=OPTIONS eng=OPTIONS
[STR__FRONTEND__PLAY_ADVERT]
eng=PLAY TRAILER
[STR__FRONTEND__CROSS_TO_SELECT] [STR__FRONTEND__CROSS_TO_SELECT]
eng=Select eng=Select

View File

@ -192,6 +192,7 @@ fileio_src := fileio \
frontend_src := demomode \ frontend_src := demomode \
frontend \ frontend \
fmvad \
fmvthq \ fmvthq \
fmvintro \ fmvintro \
maintitl \ maintitl \

View File

@ -16,7 +16,7 @@
Includes Includes
-------- */ -------- */
#include "frontend\fmvintro.h" #include "frontend\fmvad.h"
#ifndef __FMV_HEADER__ #ifndef __FMV_HEADER__
#include "fmv\fmv.h" #include "fmv\fmv.h"
@ -80,10 +80,14 @@ static bool fmvPerFrameFunc()
Params: Params:
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CFrontEndFMVIntro::select() void CFrontEndFMVAdvert::select()
{ {
StopLoad(); StopLoad();
#if defined(__TERRITORY_EUR__)
FMV_play(FMV_INTRO,&fmvPerFrameFunc); FMV_play(FMV_INTRO,&fmvPerFrameFunc);
#else
ASSERT(0);
#endif
} }
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
@ -92,7 +96,7 @@ void CFrontEndFMVIntro::select()
Params: Params:
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
int CFrontEndFMVIntro::isReadyToExit() int CFrontEndFMVAdvert::isReadyToExit()
{ {
return true; return true;
} }
@ -103,7 +107,7 @@ int CFrontEndFMVIntro::isReadyToExit()
Params: Params:
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
CFrontEndScene::FrontEndMode CFrontEndFMVIntro::getNextMode() CFrontEndScene::FrontEndMode CFrontEndFMVAdvert::getNextMode()
{ {
return CFrontEndScene::MODE__MAIN_TITLES; return CFrontEndScene::MODE__MAIN_TITLES;
} }

View File

@ -34,7 +34,7 @@
Structure defintions Structure defintions
-------------------- */ -------------------- */
class CFrontEndFMVIntro : public CFrontEndMode class CFrontEndFMVAdvert : public CFrontEndMode
{ {
public: public:
void select(); void select();

View File

@ -30,6 +30,10 @@
#include "frontend\maintitl.h" #include "frontend\maintitl.h"
#endif #endif
#ifndef __FRONTEND_FMVAD_H__
#include "frontend\fmvad.h"
#endif
#ifndef __FRONTEND_FMVTHQ_H__ #ifndef __FRONTEND_FMVTHQ_H__
#include "frontend\fmvthq.h" #include "frontend\fmvthq.h"
#endif #endif
@ -110,6 +114,7 @@
---- */ ---- */
static CFrontEndNickLogo s_nickLogo; static CFrontEndNickLogo s_nickLogo;
static CFrontEndFMVAdvert s_frontEndFMVAdvert;
static CFrontEndFMVTHQ s_frontEndFMVTHQ; static CFrontEndFMVTHQ s_frontEndFMVTHQ;
static CFrontEndFMVIntro s_frontEndFMVIntro; static CFrontEndFMVIntro s_frontEndFMVIntro;
static CFrontEndMainTitles s_frontEndModeMainTitles; static CFrontEndMainTitles s_frontEndModeMainTitles;
@ -120,6 +125,7 @@ static CFrontEndDemoMode s_frontEndDemoMode;
CFrontEndMode *CFrontEndScene::s_modeCodes[]= CFrontEndMode *CFrontEndScene::s_modeCodes[]=
{ {
&s_nickLogo, // MODE__NICK_LOGO &s_nickLogo, // MODE__NICK_LOGO
&s_frontEndFMVAdvert, // MODE__FMV_ADVERT
&s_frontEndFMVTHQ, // MODE__FMV_THQ &s_frontEndFMVTHQ, // MODE__FMV_THQ
&s_frontEndFMVIntro, // MODE__FMV_INTRO &s_frontEndFMVIntro, // MODE__FMV_INTRO
&s_frontEndModeMainTitles, // MODE__MAIN_TITLES &s_frontEndModeMainTitles, // MODE__MAIN_TITLES

View File

@ -47,6 +47,7 @@ public:
typedef enum typedef enum
{ {
MODE__NICK_LOGO, MODE__NICK_LOGO,
MODE__FMV_ADVERT,
MODE__FMV_THQ, MODE__FMV_THQ,
MODE__FMV_INTRO, MODE__FMV_INTRO,
MODE__MAIN_TITLES, MODE__MAIN_TITLES,

View File

@ -149,6 +149,12 @@ void CFrontEndMainTitles::init()
50,20,200,20, 50,20,200,20,
STR__FRONTEND__OPTIONS, STR__FRONTEND__OPTIONS,
&m_gotoOptionsFlag,true); &m_gotoOptionsFlag,true);
#if defined(__TERRITORY_EUR__)
CGUIFactory::createValueButtonFrame(m_mainMenu,
50,40,200,20,
STR__FRONTEND__PLAY_ADVERT,
&m_gotoAdvertFlag,true);
#endif
} }
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
@ -184,6 +190,9 @@ void CFrontEndMainTitles::select()
m_startGameFlag=false; m_startGameFlag=false;
m_gotoOptionsFlag=false; m_gotoOptionsFlag=false;
#if defined(__TERRITORY_EUR__)
m_gotoAdvertFlag=false;
#endif
m_demoTimeout=0; m_demoTimeout=0;
@ -303,6 +312,14 @@ void CFrontEndMainTitles::think(int _frames)
m_mode=MODE__GOTO_OPTIONS; m_mode=MODE__GOTO_OPTIONS;
m_mainMenu->unselect(); m_mainMenu->unselect();
} }
#if defined(__TERRITORY_EUR__)
else if(m_gotoAdvertFlag)
{
CFader::setFadingOut();
m_mode=MODE__GOTO_ADVERT;
m_mainMenu->unselect();
}
#endif
break; break;
default: default:
@ -344,7 +361,7 @@ void CFrontEndMainTitles::think(int _frames)
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
int CFrontEndMainTitles::isReadyToExit() int CFrontEndMainTitles::isReadyToExit()
{ {
return !CFader::isFading()&&(m_mode==MODE__GOTO_CHOOSE_SLOT||m_mode==MODE__GOTO_OPTIONS||m_mode==MODE__GOTO_DEMO); return !CFader::isFading()&&(m_mode==MODE__GOTO_CHOOSE_SLOT||m_mode==MODE__GOTO_OPTIONS||m_mode==MODE__GOTO_ADVERT||m_mode==MODE__GOTO_DEMO);
} }
@ -374,6 +391,10 @@ CFrontEndScene::FrontEndMode CFrontEndMainTitles::getNextMode()
ret=CFrontEndScene::MODE__GAME_OPTIONS; ret=CFrontEndScene::MODE__GAME_OPTIONS;
break; break;
case MODE__GOTO_ADVERT:
ret=CFrontEndScene::MODE__FMV_ADVERT;
break;
case MODE__GOTO_DEMO: case MODE__GOTO_DEMO:
ret=CFrontEndScene::MODE__DEMO; ret=CFrontEndScene::MODE__DEMO;
break; break;

View File

@ -76,6 +76,7 @@ private:
MODE__GOTO_CHOOSE_SLOT, MODE__GOTO_CHOOSE_SLOT,
MODE__GOTO_OPTIONS, MODE__GOTO_OPTIONS,
MODE__GOTO_ADVERT,
MODE__GOTO_DEMO, MODE__GOTO_DEMO,
}; };
@ -100,6 +101,9 @@ private:
int m_startGameFlag; int m_startGameFlag;
int m_gotoOptionsFlag; int m_gotoOptionsFlag;
#if defined(__TERRITORY_EUR__)
int m_gotoAdvertFlag;
#endif
int m_demoTimeout; int m_demoTimeout;
int m_musicStarted; int m_musicStarted;

View File

@ -545,6 +545,14 @@ SOURCE=..\..\..\source\frontend\demomode.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\..\source\frontend\fmvad.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\source\frontend\fmvad.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\frontend\fmvintro.cpp SOURCE=..\..\..\source\frontend\fmvintro.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File