thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for bug #882083 (COMI: CD change cancel button)

Browse source 
svn-id: r12744
This commit is contained in:
Max Horn 2004-02-05 22:39:13 +00:00
parent f98cc6f02e
commit 7038f2f6cf
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scumm/resource.cpp
View file

@ -229,12 +229,12 @@ void ScummEngine::askForDisk(const char *filename, int disknum) {
_imuseDigital->stopAllSounds(true); _imuseDigital->stopAllSounds(true);
#ifdef MACOSX #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 #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 #endif
result = displayError(true, buf); result = displayError("Quit", buf);
if (result == 2) if (result == 2)
error("Cannot find file: '%s'", filename); error("Cannot find file: '%s'", filename);
} else { } else {

2
scumm/scumm.h
View file

@ -379,7 +379,7 @@ protected:
public: public:
void optionsDialog(); // Used by MainMenuDialog::handleCommand() void optionsDialog(); // Used by MainMenuDialog::handleCommand()
protected: protected:
char displayError(bool showCancel, const char *message, ...); char displayError(const char *altButton, const char *message, ...);
protected: protected:
byte _fastMode; byte _fastMode;

6
scumm/scummvm.cpp
View file

@ -1434,7 +1434,7 @@ load_game:
makeSavegameName(filename, _saveLoadSlot, _saveTemporaryState); makeSavegameName(filename, _saveLoadSlot, _saveTemporaryState);
if (!success) { if (!success) {
displayError(false, errMsg, filename); displayError(0, errMsg, filename);
} else if (_saveLoadFlag == 1 && _saveLoadSlot != 0 && !_saveTemporaryState) { } else if (_saveLoadFlag == 1 && _saveLoadSlot != 0 && !_saveTemporaryState) {
// Display "Save successful" message, except for auto saves // Display "Save successful" message, except for auto saves
#ifdef __PALM_OS__ #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__ #ifdef __PALM_OS__
char buf[256]; // 1024 is too big overflow the stack char buf[256]; // 1024 is too big overflow the stack
#else #else
@ -2627,7 +2627,7 @@ char ScummEngine::displayError(bool showCancel, const char *message, ...) {
vsprintf(buf, message, va); vsprintf(buf, message, va);
va_end(va); va_end(va);
GUI::MessageDialog dialog(buf, "OK"); GUI::MessageDialog dialog(buf, "OK", altButton);
return runDialog(dialog); return runDialog(dialog);
} }