aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.h
diff options
context:
space:
mode:
authorJames Brown2003-01-02 10:36:17 +0000
committerJames Brown2003-01-02 10:36:17 +0000
commit9df455ce380f4a7389ca093dfd619761c3bea046 (patch)
treedd539999845c443a135ed04370e1ca22342cbc7f /scumm/scumm.h
parent3c3c5bb57467d4bcef2c71c923dd9cacc49217f2 (diff)
downloadscummvm-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/scumm.h')
-rw-r--r--scumm/scumm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 716d94927f..edd0c67d77 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -321,7 +321,7 @@ public:
void pauseDialog();
void saveloadDialog();
void optionsDialog();
- void displayError(const char *message, ...);
+ char displayError(bool showCancel, const char *message, ...);
// Misc startup/event functions
void main();
@@ -512,7 +512,7 @@ public:
void closeRoom();
void deleteRoomOffsets();
void readRoomsOffsets();
- void askForDisk(const char *filename);
+ void askForDisk(const char *filename, int disknum);
bool openResourceFile(const char *filename);
void loadPtrToResource(int type, int i, byte *ptr);
void readResTypeList(int id, uint32 tag, const char *name);