From b50df858eb52520b529597d98fcd0d9b29619930 Mon Sep 17 00:00:00 2001
From: Christopher Page
Date: Mon, 7 Jul 2008 06:05:48 +0000
Subject: 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
---
 engines/scumm/dialogs.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/scumm/dialogs.cpp')

diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 6d1cf1bbd8..07195f5a66 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -435,7 +435,7 @@ Common::StringList generateSavegameList(ScummEngine *scumm, bool saveMode) {
 	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 @@ MainMenuDialog::MainMenuDialog(ScummEngine *scumm)
 	_loadDialog = new SaveLoadChooser("Load game:", "Load", false, scumm);
 }
 
-MainMenuDialog::~MainMenuDialog() {
+ScummMenuDialog::~ScummMenuDialog() {
 	delete _aboutDialog;
 	delete _optionsDialog;
 #ifndef DISABLE_HELP
@@ -473,7 +473,7 @@ MainMenuDialog::~MainMenuDialog() {
 	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::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
 	}
 }
 
-void MainMenuDialog::save() {
+void ScummMenuDialog::save() {
 	int idx;
 	_saveDialog->setList(generateSavegameList(_vm, true));
 	idx = _saveDialog->runModal();
@@ -523,7 +523,7 @@ void MainMenuDialog::save() {
 	}
 }
 
-void MainMenuDialog::load() {
+void ScummMenuDialog::load() {
 	int idx;
 	_loadDialog->setList(generateSavegameList(_vm, false));
 	idx = _loadDialog->runModal();
-- 
cgit v1.2.3


From e9c6b03fc73ad5d556eb56afed6e55ef1b0bef67 Mon Sep 17 00:00:00 2001
From: Christopher Page
Date: Fri, 11 Jul 2008 01:22:37 +0000
Subject: SCUMM works with new GMM implementation

svn-id: r33001
---
 engines/scumm/dialogs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/scumm/dialogs.cpp')

diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 07195f5a66..310cfc50a6 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -496,7 +496,7 @@ void ScummMenuDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 da
 		break;
 #endif
 	case kQuitCmd:
-		_vm->_quit = true;
+		_vm->quitGame();
 		close();
 		break;
 	default:
-- 
cgit v1.2.3


From c657f1d09a1a9c2e8bcb60e21254706d540e6d1c Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 29 Aug 2008 09:44:05 +0000
Subject: Made out-of-memory error in SCUMM a bit more verbose

svn-id: r34201
---
 engines/scumm/dialogs.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'engines/scumm/dialogs.cpp')

diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index f9a8647d0d..7f87a9e623 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -395,8 +395,7 @@ void SaveLoadChooser::updateInfos(bool redraw) {
 		int hours = minutes / 60;
 		minutes %= 60;
 
-		snprintf(buffer, 32, "Playtime: %.2d:%.2d",
-			hours & 0xFF, minutes & 0xFF);
+		snprintf(buffer, 32, "Playtime: %.2d:%.2d", hours, minutes);
 		_playtime->setLabel(buffer);
 	} else {
 		_date->setLabel("No date saved");
-- 
cgit v1.2.3