diff --git a/data/translations/text.dat b/data/translations/text.dat index 2b8b1b2d0..119d6f80f 100644 --- a/data/translations/text.dat +++ b/data/translations/text.dat @@ -50,6 +50,8 @@ eng=PRESS START eng=START GAME [STR__FRONTEND__OPTIONS] eng=OPTIONS +[STR__FRONTEND__PLAY_ADVERT] +eng=PLAY TRAILER [STR__FRONTEND__CROSS_TO_SELECT] eng=Select diff --git a/makefile.gaz b/makefile.gaz index 2ff07aad5..6ee953468 100644 --- a/makefile.gaz +++ b/makefile.gaz @@ -192,6 +192,7 @@ fileio_src := fileio \ frontend_src := demomode \ frontend \ + fmvad \ fmvthq \ fmvintro \ maintitl \ diff --git a/source/frontend/fmvad.cpp b/source/frontend/fmvad.cpp index 4c0b94458..a59655826 100644 --- a/source/frontend/fmvad.cpp +++ b/source/frontend/fmvad.cpp @@ -16,7 +16,7 @@ Includes -------- */ -#include "frontend\fmvintro.h" +#include "frontend\fmvad.h" #ifndef __FMV_HEADER__ #include "fmv\fmv.h" @@ -80,10 +80,14 @@ static bool fmvPerFrameFunc() Params: Returns: ---------------------------------------------------------------------- */ -void CFrontEndFMVIntro::select() +void CFrontEndFMVAdvert::select() { StopLoad(); +#if defined(__TERRITORY_EUR__) FMV_play(FMV_INTRO,&fmvPerFrameFunc); +#else + ASSERT(0); +#endif } /*---------------------------------------------------------------------- @@ -92,7 +96,7 @@ void CFrontEndFMVIntro::select() Params: Returns: ---------------------------------------------------------------------- */ -int CFrontEndFMVIntro::isReadyToExit() +int CFrontEndFMVAdvert::isReadyToExit() { return true; } @@ -103,7 +107,7 @@ int CFrontEndFMVIntro::isReadyToExit() Params: Returns: ---------------------------------------------------------------------- */ -CFrontEndScene::FrontEndMode CFrontEndFMVIntro::getNextMode() +CFrontEndScene::FrontEndMode CFrontEndFMVAdvert::getNextMode() { return CFrontEndScene::MODE__MAIN_TITLES; } diff --git a/source/frontend/fmvad.h b/source/frontend/fmvad.h index 365a08d9d..a34ef8849 100644 --- a/source/frontend/fmvad.h +++ b/source/frontend/fmvad.h @@ -34,7 +34,7 @@ Structure defintions -------------------- */ -class CFrontEndFMVIntro : public CFrontEndMode +class CFrontEndFMVAdvert : public CFrontEndMode { public: void select(); diff --git a/source/frontend/frontend.cpp b/source/frontend/frontend.cpp index 36aff9f12..238588f93 100644 --- a/source/frontend/frontend.cpp +++ b/source/frontend/frontend.cpp @@ -30,6 +30,10 @@ #include "frontend\maintitl.h" #endif +#ifndef __FRONTEND_FMVAD_H__ +#include "frontend\fmvad.h" +#endif + #ifndef __FRONTEND_FMVTHQ_H__ #include "frontend\fmvthq.h" #endif @@ -110,6 +114,7 @@ ---- */ static CFrontEndNickLogo s_nickLogo; +static CFrontEndFMVAdvert s_frontEndFMVAdvert; static CFrontEndFMVTHQ s_frontEndFMVTHQ; static CFrontEndFMVIntro s_frontEndFMVIntro; static CFrontEndMainTitles s_frontEndModeMainTitles; @@ -120,6 +125,7 @@ static CFrontEndDemoMode s_frontEndDemoMode; CFrontEndMode *CFrontEndScene::s_modeCodes[]= { &s_nickLogo, // MODE__NICK_LOGO + &s_frontEndFMVAdvert, // MODE__FMV_ADVERT &s_frontEndFMVTHQ, // MODE__FMV_THQ &s_frontEndFMVIntro, // MODE__FMV_INTRO &s_frontEndModeMainTitles, // MODE__MAIN_TITLES diff --git a/source/frontend/frontend.h b/source/frontend/frontend.h index 721b4de6d..3ea07184f 100644 --- a/source/frontend/frontend.h +++ b/source/frontend/frontend.h @@ -47,6 +47,7 @@ public: typedef enum { MODE__NICK_LOGO, + MODE__FMV_ADVERT, MODE__FMV_THQ, MODE__FMV_INTRO, MODE__MAIN_TITLES, diff --git a/source/frontend/maintitl.cpp b/source/frontend/maintitl.cpp index d4c53d18b..11eb6936a 100644 --- a/source/frontend/maintitl.cpp +++ b/source/frontend/maintitl.cpp @@ -149,6 +149,12 @@ void CFrontEndMainTitles::init() 50,20,200,20, STR__FRONTEND__OPTIONS, &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_gotoOptionsFlag=false; +#if defined(__TERRITORY_EUR__) + m_gotoAdvertFlag=false; +#endif m_demoTimeout=0; @@ -303,6 +312,14 @@ void CFrontEndMainTitles::think(int _frames) m_mode=MODE__GOTO_OPTIONS; m_mainMenu->unselect(); } +#if defined(__TERRITORY_EUR__) + else if(m_gotoAdvertFlag) + { + CFader::setFadingOut(); + m_mode=MODE__GOTO_ADVERT; + m_mainMenu->unselect(); + } +#endif break; default: @@ -344,7 +361,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); + 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; break; + case MODE__GOTO_ADVERT: + ret=CFrontEndScene::MODE__FMV_ADVERT; + break; + case MODE__GOTO_DEMO: ret=CFrontEndScene::MODE__DEMO; break; diff --git a/source/frontend/maintitl.h b/source/frontend/maintitl.h index c6352c85f..9a7ddf1a3 100644 --- a/source/frontend/maintitl.h +++ b/source/frontend/maintitl.h @@ -76,6 +76,7 @@ private: MODE__GOTO_CHOOSE_SLOT, MODE__GOTO_OPTIONS, + MODE__GOTO_ADVERT, MODE__GOTO_DEMO, }; @@ -100,6 +101,9 @@ private: int m_startGameFlag; int m_gotoOptionsFlag; +#if defined(__TERRITORY_EUR__) + int m_gotoAdvertFlag; +#endif int m_demoTimeout; int m_musicStarted; diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp index 3dfd416be..476c05f83 100644 --- a/users/paul/spongebob project/spongebob project.dsp +++ b/users/paul/spongebob project/spongebob project.dsp @@ -545,6 +545,14 @@ SOURCE=..\..\..\source\frontend\demomode.h # End 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 # End Source File # Begin Source File