[Scummvm-cvs-logs] SF.net SVN: scummvm: [32937] scummvm/branches/gsoc2008-rtl/engines/scumm

[cpage88 at users.sourceforge.net]

Revision: 32937
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32937&view=rev
Author:   cpage88
Date:     2008-07-06 23:05:48 -0700 (Sun, 06 Jul 2008)

Log Message:
-----------
Changed the name of the Scumm menu dialog class MainMenuDialog to ScummMenuDialog, to avoid confusion and conflict with the Global Main Menu class

Modified Paths:
--------------
    scummvm/branches/gsoc2008-rtl/engines/scumm/dialogs.cpp
    scummvm/branches/gsoc2008-rtl/engines/scumm/dialogs.h
    scummvm/branches/gsoc2008-rtl/engines/scumm/input.cpp
    scummvm/branches/gsoc2008-rtl/engines/scumm/scumm.cpp
    scummvm/branches/gsoc2008-rtl/engines/scumm/scumm.h

Modified: scummvm/branches/gsoc2008-rtl/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/scumm/dialogs.cpp	2008-07-07 05:51:39 UTC (rev 32936)
+++ scummvm/branches/gsoc2008-rtl/engines/scumm/dialogs.cpp	2008-07-07 06:05:48 UTC (rev 32937)
@@ -435,7 +435,7 @@
 	return descriptions;
 }
 
-MainMenuDialog::MainMenuDialog(ScummEngine *scumm)
+ScummMenuDialog::ScummMenuDialog(ScummEngine *scumm)
 	: ScummDialog("scummmain"), _vm(scumm) {
 
 	new GUI::ButtonWidget(this, "scummmain_resume", "Resume", kPlayCmd, 'P');
@@ -463,7 +463,7 @@
 	_loadDialog = new SaveLoadChooser("Load game:", "Load", false, scumm);
 }
 
-MainMenuDialog::~MainMenuDialog() {
+ScummMenuDialog::~ScummMenuDialog() {
 	delete _aboutDialog;
 	delete _optionsDialog;
 #ifndef DISABLE_HELP
@@ -473,7 +473,7 @@
 	delete _loadDialog;
 }
 
-void MainMenuDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
+void ScummMenuDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
 	switch (cmd) {
 	case kSaveCmd:
 		save();
@@ -504,7 +504,7 @@
 	}
 }
 
-void MainMenuDialog::save() {
+void ScummMenuDialog::save() {
 	int idx;
 	_saveDialog->setList(generateSavegameList(_vm, true));
 	idx = _saveDialog->runModal();
@@ -523,7 +523,7 @@
 	}
 }
 
-void MainMenuDialog::load() {
+void ScummMenuDialog::load() {
 	int idx;
 	_loadDialog->setList(generateSavegameList(_vm, false));
 	idx = _loadDialog->runModal();

Modified: scummvm/branches/gsoc2008-rtl/engines/scumm/dialogs.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/scumm/dialogs.h	2008-07-07 05:51:39 UTC (rev 32936)
+++ scummvm/branches/gsoc2008-rtl/engines/scumm/dialogs.h	2008-07-07 06:05:48 UTC (rev 32937)
@@ -82,10 +82,10 @@
 	virtual void reflowLayout();
 };
 
-class MainMenuDialog : public ScummDialog {
+class ScummMenuDialog : public ScummDialog {
 public:
-	MainMenuDialog(ScummEngine *scumm);
-	~MainMenuDialog();
+	ScummMenuDialog(ScummEngine *scumm);
+	~ScummMenuDialog();
 	virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
 
 protected:

Modified: scummvm/branches/gsoc2008-rtl/engines/scumm/input.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/scumm/input.cpp	2008-07-07 05:51:39 UTC (rev 32936)
+++ scummvm/branches/gsoc2008-rtl/engines/scumm/input.cpp	2008-07-07 06:05:48 UTC (rev 32937)
@@ -475,7 +475,7 @@
 		if (VAR_SAVELOAD_SCRIPT != 0xFF && _currentRoom != 0)
 			runScript(VAR(VAR_SAVELOAD_SCRIPT), 0, 0, 0);
 
-		mainMenuDialog();		// Display NewGui
+		scummMenuDialog();		// Display NewGui
 
 		if (VAR_SAVELOAD_SCRIPT != 0xFF && _currentRoom != 0)
 			runScript(VAR(VAR_SAVELOAD_SCRIPT2), 0, 0, 0);

Modified: scummvm/branches/gsoc2008-rtl/engines/scumm/scumm.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/scumm/scumm.cpp	2008-07-07 05:51:39 UTC (rev 32936)
+++ scummvm/branches/gsoc2008-rtl/engines/scumm/scumm.cpp	2008-07-07 06:05:48 UTC (rev 32937)
@@ -109,7 +109,7 @@
 	  _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 @@
 	memset(&vm, 0, sizeof(vm));
 	_quit = false;
 	_pauseDialog = NULL;
-	_mainMenuDialog = NULL;
+	_scummMenuDialog = NULL;
 	_versionDialog = NULL;
 	_fastMode = 0;
 	_actors = NULL;
@@ -561,7 +561,7 @@
 	delete _2byteFontPtr;
 	delete _charset;
 	delete _pauseDialog;
-	delete _mainMenuDialog;
+	delete _scummMenuDialog;
 	delete _versionDialog;
 	delete _fileHandle;
 
@@ -2306,10 +2306,10 @@
 	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();
 }
 

Modified: scummvm/branches/gsoc2008-rtl/engines/scumm/scumm.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/scumm/scumm.h	2008-07-07 05:51:39 UTC (rev 32936)
+++ scummvm/branches/gsoc2008-rtl/engines/scumm/scumm.h	2008-07-07 06:05:48 UTC (rev 32937)
@@ -501,14 +501,14 @@
 protected:
 	Dialog *_pauseDialog;
 	Dialog *_versionDialog;
-	Dialog *_mainMenuDialog;
+	Dialog *_scummMenuDialog;
 
 	virtual int runDialog(Dialog &dialog);
 	void confirmExitDialog();
 	void confirmRestartDialog();
 	void pauseDialog();
 	void versionDialog();
-	void mainMenuDialog();
+	void scummMenuDialog();
 
 	char displayMessage(const char *altButton, const char *message, ...);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.