aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2004-02-05 22:39:13 +0000
committerMax Horn2004-02-05 22:39:13 +0000
commit7038f2f6cf02671beb02bc00b86fef2219ad828a (patch)
tree790830261f6fbdbeeda7ef79d2ed492323b253fb /scumm
parentf98cc6f02eb2143a1267fd8cc2b6a8c949b79833 (diff)
downloadscummvm-rg350-7038f2f6cf02671beb02bc00b86fef2219ad828a.tar.gz
scummvm-rg350-7038f2f6cf02671beb02bc00b86fef2219ad828a.tar.bz2
scummvm-rg350-7038f2f6cf02671beb02bc00b86fef2219ad828a.zip
Fix for bug #882083 (COMI: CD change cancel button)
svn-id: r12744
Diffstat (limited to 'scumm')
-rw-r--r--scumm/resource.cpp6
-rw-r--r--scumm/scumm.h2
-rw-r--r--scumm/scummvm.cpp6
3 files changed, 7 insertions, 7 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index 9e02014a2f..3fdb9784d7 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -229,12 +229,12 @@ void ScummEngine::askForDisk(const char *filename, int disknum) {
_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 {
diff --git a/scumm/scumm.h b/scumm/scumm.h
index b541bca4c9..0a923ead55 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -379,7 +379,7 @@ protected:
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;
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 3051fe9600..eb9c4234a8 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1434,7 +1434,7 @@ load_game:
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 @@ void ScummEngine::confirmrestartDialog() {
}
}
-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 @@ char ScummEngine::displayError(bool showCancel, const char *message, ...) {
vsprintf(buf, message, va);
va_end(va);
- GUI::MessageDialog dialog(buf, "OK");
+ GUI::MessageDialog dialog(buf, "OK", altButton);
return runDialog(dialog);
}