[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.185,1.186 scumm.h,1.368,1.369 scummvm.cpp,2.565,2.566

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22731

Modified Files:
	resource.cpp scumm.h scummvm.cpp 
Log Message:
Fix for bug #882083 (COMI: CD change cancel button)

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -d -r1.185 -r1.186
--- resource.cpp	5 Feb 2004 11:59:06 -0000	1.185
+++ resource.cpp	5 Feb 2004 22:39:13 -0000	1.186
@@ -229,12 +229,12 @@
 		_imuseDigital->stopAllSounds(true);
 
 #ifdef MACOSX
-		sprintf(buf, "Cannot find file: '%s'\nPlease insert disc %d.\nHit OK to retry, Cancel to exit", filename, disknum);
+		sprintf(buf, "Cannot find file: '%s'\nPlease insert disc %d.\nPress OK to retry, Quit to exit", filename, disknum);
 #else
-		sprintf(buf, "Cannot find file: '%s'\nInsert disc %d into drive %s\nHit OK to retry, Cancel to exit", filename, disknum, getGameDataPath());
+		sprintf(buf, "Cannot find file: '%s'\nInsert disc %d into drive %s\nPress OK to retry, Quit to exit", filename, disknum, getGameDataPath());
 #endif
 
-		result = displayError(true, buf);
+		result = displayError("Quit", buf);
 		if (result == 2)
 			error("Cannot find file: '%s'", filename);
 	} else { 

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -d -r1.368 -r1.369
--- scumm.h	31 Jan 2004 22:11:01 -0000	1.368
+++ scumm.h	5 Feb 2004 22:39:13 -0000	1.369
@@ -379,7 +379,7 @@
 public:
 	void optionsDialog();	// Used by MainMenuDialog::handleCommand()
 protected:
-	char displayError(bool showCancel, const char *message, ...);
+	char displayError(const char *altButton, const char *message, ...);
 
 protected:
 	byte _fastMode;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.565
retrieving revision 2.566
diff -u -d -r2.565 -r2.566
--- scummvm.cpp	5 Feb 2004 00:19:55 -0000	2.565
+++ scummvm.cpp	5 Feb 2004 22:39:13 -0000	2.566
@@ -1434,7 +1434,7 @@
 
 		makeSavegameName(filename, _saveLoadSlot, _saveTemporaryState);
 		if (!success) {
-			displayError(false, errMsg, filename);
+			displayError(0, errMsg, filename);
 		} else if (_saveLoadFlag == 1 && _saveLoadSlot != 0 && !_saveTemporaryState) {
 			// Display "Save successful" message, except for auto saves
 #ifdef __PALM_OS__
@@ -2615,7 +2615,7 @@
 	}
 }
 
-char ScummEngine::displayError(bool showCancel, const char *message, ...) {
+char ScummEngine::displayError(const char *altButton, const char *message, ...) {
 #ifdef __PALM_OS__
 	char buf[256]; // 1024 is too big overflow the stack
 #else
@@ -2627,7 +2627,7 @@
 	vsprintf(buf, message, va);
 	va_end(va);
 
-	GUI::MessageDialog dialog(buf, "OK");
+	GUI::MessageDialog dialog(buf, "OK", altButton);
 	return runDialog(dialog);
 }