[Scummvm-cvs-logs] SF.net SVN: scummvm:[55620] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sat Jan 29 19:40:04 CET 2011
Revision: 55620
http://scummvm.svn.sourceforge.net/scummvm/?rev=55620&view=rev
Author: lordhoto
Date: 2011-01-29 18:40:04 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
KYRA: Clean up main menu code in Kyra2/Kyra3.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra_hof.h
scummvm/trunk/engines/kyra/kyra_mr.cpp
scummvm/trunk/engines/kyra/kyra_mr.h
scummvm/trunk/engines/kyra/kyra_v2.cpp
scummvm/trunk/engines/kyra/kyra_v2.h
Modified: scummvm/trunk/engines/kyra/kyra_hof.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.h 2011-01-29 18:20:38 UTC (rev 55619)
+++ scummvm/trunk/engines/kyra/kyra_hof.h 2011-01-29 18:40:04 UTC (rev 55620)
@@ -293,6 +293,8 @@
void seq_scrollPage(int bottom, int top);
void seq_showStarcraftLogo();
+ MainMenu *_menu;
+
void seq_init();
void seq_uninit();
Modified: scummvm/trunk/engines/kyra/kyra_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.cpp 2011-01-29 18:20:38 UTC (rev 55619)
+++ scummvm/trunk/engines/kyra/kyra_mr.cpp 2011-01-29 18:40:04 UTC (rev 55620)
@@ -121,6 +121,7 @@
_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() {
+ uninitMainMenu();
+
delete _screen;
delete _soundDigital;
- delete _menuAnim;
- _menuAnim = 0;
-
delete[] _itemBuffer1;
delete[] _itemBuffer2;
delete[] _scoreFile;
Modified: scummvm/trunk/engines/kyra/kyra_mr.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.h 2011-01-29 18:20:38 UTC (rev 55619)
+++ scummvm/trunk/engines/kyra/kyra_mr.h 2011-01-29 18:40:04 UTC (rev 55620)
@@ -165,6 +165,7 @@
void initMainMenu();
void uninitMainMenu();
+ MainMenu *_menu;
WSAMovie_v2 *_menuAnim;
// timer
Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp 2011-01-29 18:20:38 UTC (rev 55619)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp 2011-01-29 18:40:04 UTC (rev 55620)
@@ -74,8 +74,6 @@
_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 @@
_emc->unload(&_sceneScriptData);
- delete _menu;
- _menu = 0;
-
delete[] _animObjects;
for (Common::Array<const Opcode*>::iterator i = _opcodesAnimation.begin(); i != _opcodesAnimation.end(); ++i)
Modified: scummvm/trunk/engines/kyra/kyra_v2.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.h 2011-01-29 18:20:38 UTC (rev 55619)
+++ scummvm/trunk/engines/kyra/kyra_v2.h 2011-01-29 18:40:04 UTC (rev 55620)
@@ -97,9 +97,6 @@
// detection
int _lang;
- // MainMenu
- MainMenu *_menu;
-
// Input
virtual int inputSceneChange(int x, int y, int unk1, int unk2) = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list