diff options
author | Christopher Page | 2008-07-07 06:05:48 +0000 |
---|---|---|
committer | Christopher Page | 2008-07-07 06:05:48 +0000 |
commit | b50df858eb52520b529597d98fcd0d9b29619930 (patch) | |
tree | 682ef79468d1c134a1d99e14ab0ec91eac1b92f8 /engines/scumm/scumm.cpp | |
parent | 0bffc3cb7b812e43ad58fe5e8d53eebea13063f9 (diff) | |
download | scummvm-rg350-b50df858eb52520b529597d98fcd0d9b29619930.tar.gz scummvm-rg350-b50df858eb52520b529597d98fcd0d9b29619930.tar.bz2 scummvm-rg350-b50df858eb52520b529597d98fcd0d9b29619930.zip |
Changed the name of the Scumm menu dialog class MainMenuDialog to ScummMenuDialog, to avoid confusion and conflict with the Global Main Menu class
svn-id: r32937
Diffstat (limited to 'engines/scumm/scumm.cpp')
-rw-r--r-- | engines/scumm/scumm.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 0e6c0b3773..0e62ef4b19 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -109,7 +109,7 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr) _language(dr.language), _debugger(0), _currentScript(0xFF), // Let debug() work on init stage - _pauseDialog(0), _mainMenuDialog(0), _versionDialog(0) { + _pauseDialog(0), _scummMenuDialog(0), _versionDialog(0) { if (_game.platform == Common::kPlatformNES) { _gdi = new GdiNES(this); @@ -145,7 +145,7 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr) memset(&vm, 0, sizeof(vm)); _quit = false; _pauseDialog = NULL; - _mainMenuDialog = NULL; + _scummMenuDialog = NULL; _versionDialog = NULL; _fastMode = 0; _actors = NULL; @@ -561,7 +561,7 @@ ScummEngine::~ScummEngine() { delete _2byteFontPtr; delete _charset; delete _pauseDialog; - delete _mainMenuDialog; + delete _scummMenuDialog; delete _versionDialog; delete _fileHandle; @@ -2306,10 +2306,10 @@ void ScummEngine::versionDialog() { runDialog(*_versionDialog); } -void ScummEngine::mainMenuDialog() { - if (!_mainMenuDialog) - _mainMenuDialog = new MainMenuDialog(this); - runDialog(*_mainMenuDialog); +void ScummEngine::scummMenuDialog() { + if (!_scummMenuDialog) + _scummMenuDialog = new ScummMenuDialog(this); + runDialog(*_scummMenuDialog); syncSoundSettings(); } |