libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-22 04:01:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

KYRA: Clean up main menu code in Kyra2/Kyra3.

Browse Source 
svn-id: r55620
This commit is contained in:
Johannes Schickel 2011-01-29 18:40:04 +00:00
parent 450dac35c7
commit 2cc3bd880f
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/kyra/kyra_hof.h
View File

@ -293,6 +293,8 @@ protected:
void seq_scrollPage(int bottom, int top);
void seq_showStarcraftLogo();
MainMenu *_menu;
void seq_init();
void seq_uninit();

6
engines/kyra/kyra_mr.cpp
View File

@ -121,6 +121,7 @@ KyraEngine_MR::KyraEngine_MR(OSystem *system, const GameFlags &flags) : KyraEngi
_curDlgChapter = _curDlgIndex = _curDlgLang = -1;
_isStartupDialog = 0;
_stringBuffer = 0;
_menu = 0;
_menuAnim = 0;
_dialogSceneAnim = _dialogSceneScript = -1;
memset(&_dialogScriptData, 0, sizeof(_dialogScriptData));
@ -153,12 +154,11 @@ KyraEngine_MR::KyraEngine_MR(OSystem *system, const GameFlags &flags) : KyraEngi
}
KyraEngine_MR::~KyraEngine_MR() {
uninitMainMenu();
delete _screen;
delete _soundDigital;
delete _menuAnim;
_menuAnim = 0;
delete[] _itemBuffer1;
delete[] _itemBuffer2;
delete[] _scoreFile;

1
engines/kyra/kyra_mr.h
View File

@ -165,6 +165,7 @@ private:
void initMainMenu();
void uninitMainMenu();
MainMenu *_menu;
WSAMovie_v2 *_menuAnim;
// timer

5
engines/kyra/kyra_v2.cpp
View File

@ -74,8 +74,6 @@ KyraEngine_v2::KyraEngine_v2(OSystem *system, const GameFlags &flags, const Engi
_pauseStart = 0;
_menu = 0;
_lang = 0;
Common::Language lang = Common::parseLanguage(ConfMan.get("language"));
if (lang == _flags.fanLang && _flags.replacedLang != Common::UNK_LANG)
@ -120,9 +118,6 @@ KyraEngine_v2::~KyraEngine_v2() {
_emc->unload(&_sceneScriptData);
delete _menu;
_menu = 0;
delete[] _animObjects;
for (Common::Array<const Opcode*>::iterator i = _opcodesAnimation.begin(); i != _opcodesAnimation.end(); ++i)

3
engines/kyra/kyra_v2.h
View File

@ -97,9 +97,6 @@ protected:
// detection
int _lang;
// MainMenu
MainMenu *_menu;
// Input
virtual int inputSceneChange(int x, int y, int unk1, int unk2) = 0;