diff options
author | James Brown | 2003-01-02 10:36:17 +0000 |
---|---|---|
committer | James Brown | 2003-01-02 10:36:17 +0000 |
commit | 9df455ce380f4a7389ca093dfd619761c3bea046 (patch) | |
tree | dd539999845c443a135ed04370e1ca22342cbc7f /scumm/scummvm.cpp | |
parent | 3c3c5bb57467d4bcef2c71c923dd9cacc49217f2 (diff) | |
download | scummvm-rg350-9df455ce380f4a7389ca093dfd619761c3bea046.tar.gz scummvm-rg350-9df455ce380f4a7389ca093dfd619761c3bea046.tar.bz2 scummvm-rg350-9df455ce380f4a7389ca093dfd619761c3bea046.zip |
Plop in some better disk switching code for CMI - I have no idea how well this will work transitioning from a disk1 room to a disk2
room in-game, but it works for bootparams and saved games..
svn-id: r6322
Diffstat (limited to 'scumm/scummvm.cpp')
-rw-r--r-- | scumm/scummvm.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 7299b046e0..b0c4a53f47 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -474,7 +474,7 @@ int Scumm::scummLoop(int delta) makeSavegameName(filename, _saveLoadSlot, _saveLoadCompatible); if (!success) { - displayError(errMsg, filename); + displayError(false, errMsg, filename); } else if (_saveLoadFlag == 1 && _saveLoadSlot != 0 && !_saveLoadCompatible) { // Display "Save succesful" message, except for auto saves char buf[1024]; @@ -1065,18 +1065,20 @@ void Scumm::optionsDialog() runDialog(_optionsDialog); } -void Scumm::displayError(const char *message, ...) +char Scumm::displayError(bool showCancel, const char *message, ...) { - char buf[1024]; + char buf[1024], result; va_list va; va_start(va, message); vsprintf(buf, message, va); va_end(va); - Dialog *dialog = new MessageDialog(_newgui, buf); - runDialog(dialog); + Dialog *dialog = new MessageDialog(_newgui, buf, 0, true, showCancel); + result = runDialog(dialog); delete dialog; + + return result; } void Scumm::shutDown(int i) |