diff options
| author | James Brown | 2002-12-26 01:15:25 +0000 |
|---|---|---|
| committer | James Brown | 2002-12-26 01:15:25 +0000 |
| commit | d8839f1be6486b6872dcc82595749a5c689a1aa6 (patch) | |
| tree | 9c42c9bc1884bbe24629aa893720895f28971101 /scumm | |
| parent | 74dd2479c95094906aa92a3789f97054d340cfa1 (diff) | |
| download | scummvm-rg350-d8839f1be6486b6872dcc82595749a5c689a1aa6.tar.gz scummvm-rg350-d8839f1be6486b6872dcc82595749a5c689a1aa6.tar.bz2 scummvm-rg350-d8839f1be6486b6872dcc82595749a5c689a1aa6.zip | |
Don't go to the save/load screen
svn-id: r6157
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scumm.h | 1 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 6 | ||||
| -rw-r--r-- | scumm/vars.cpp | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index 25a3ccf046..f393dc48e8 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -910,6 +910,7 @@ public: byte VAR_NUM_ACTOR; byte VAR_CURRENT_LIGHTS; byte VAR_CURRENTDRIVE; + byte VAR_CURRENTDISK; byte VAR_TMR_1; byte VAR_TMR_2; byte VAR_TMR_3; diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 3c3c76ba18..4e45dc9dc6 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -357,7 +357,11 @@ void Scumm::initScummVars() } else { _vars[VAR_V6_EMSSPACE] = 10000; } -} + + if (_features & GF_AFTER_V8) { // Fixme: How do we deal with non-cd installs? + _vars[VAR_CURRENTDISK] = 1; + } +} void Scumm::checkRange(int max, int min, int no, const char *str) { diff --git a/scumm/vars.cpp b/scumm/vars.cpp index a7e043d6c0..9349e59cdd 100644 --- a/scumm/vars.cpp +++ b/scumm/vars.cpp @@ -220,6 +220,7 @@ void Scumm_v8::setupScummVars() VAR_CAMERA_DEST_Y = 12; VAR_ROOM = 31; + VAR_CURRENTDISK = 42; VAR_ENTRY_SCRIPT = 51; VAR_ENTRY_SCRIPT2 = 52; |