aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-05-13 17:51:56 +0000
committerMax Horn2003-05-13 17:51:56 +0000
commit2838aae2f4e9f94ef5a81770ba5cb7297e8cb3e9 (patch)
treeccc915100e9abd3471ee4a3498cc4d9343b058ea
parentcb8d07fd62a185e73b726baebd749f4bcb8872fb (diff)
downloadscummvm-rg350-2838aae2f4e9f94ef5a81770ba5cb7297e8cb3e9.tar.gz
scummvm-rg350-2838aae2f4e9f94ef5a81770ba5cb7297e8cb3e9.tar.bz2
scummvm-rg350-2838aae2f4e9f94ef5a81770ba5cb7297e8cb3e9.zip
renamed VAR_UNK_SCRIPT to VAR_SAVELOAD_SCRIPT; fixed V8 save/load (no (known) VAR_SAVELOAD_SCRIPT value for V8)
svn-id: r7485
-rw-r--r--scumm/scumm.h4
-rw-r--r--scumm/scummvm.cpp12
-rw-r--r--scumm/vars.cpp4
3 files changed, 10 insertions, 10 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h
index aae968617e..c3a5b895c3 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -1143,8 +1143,8 @@ public:
byte VAR_RIGHTBTN_HOLD;
byte VAR_MOUSE_BUTTONS;
byte VAR_MOUSE_HOLD;
- byte VAR_UNK_SCRIPT;
- byte VAR_UNK_SCRIPT_2;
+ byte VAR_SAVELOAD_SCRIPT;
+ byte VAR_SAVELOAD_SCRIPT2;
byte VAR_DEFAULT_TALK_DELAY;
byte VAR_CHARSET_MASK;
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 3db0581bf4..892b9bdd56 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -501,8 +501,8 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst)
VAR_RIGHTBTN_HOLD = 0xFF;
VAR_MOUSE_BUTTONS = 0xFF;
VAR_MOUSE_HOLD = 0xFF;
- VAR_UNK_SCRIPT = 0xFF;
- VAR_UNK_SCRIPT_2 = 0xFF;
+ VAR_SAVELOAD_SCRIPT = 0xFF;
+ VAR_SAVELOAD_SCRIPT2 = 0xFF;
VAR_DEFAULT_TALK_DELAY = 0xFF;
VAR_CHARSET_MASK = 0xFF;
@@ -1767,13 +1767,13 @@ void Scumm::processKbd() {
} else
exitCutscene();
} else if (_lastKeyHit == saveloadkey && _currentRoom != 0) {
- if (_features & GF_AFTER_V7)
- runScript(VAR(VAR_UNK_SCRIPT), 0, 0, 0);
+ if (VAR_SAVELOAD_SCRIPT != 0xFF)
+ runScript(VAR(VAR_SAVELOAD_SCRIPT), 0, 0, 0);
saveloadDialog(); // Display NewGui
- if (_features & GF_AFTER_V7)
- runScript(VAR(VAR_UNK_SCRIPT_2), 0, 0, 0);
+ if (VAR_SAVELOAD_SCRIPT2 != 0xFF)
+ runScript(VAR(VAR_SAVELOAD_SCRIPT2), 0, 0, 0);
return;
} else if (VAR_TALKSTOP_KEY != 0xFF && _lastKeyHit == VAR(VAR_TALKSTOP_KEY)) {
_talkDelay = 0;
diff --git a/scumm/vars.cpp b/scumm/vars.cpp
index 0678734d4a..dfff047b91 100644
--- a/scumm/vars.cpp
+++ b/scumm/vars.cpp
@@ -184,8 +184,8 @@ void Scumm_v7::setupScummVars() {
VAR_HOOK_SCRIPT = 57;
VAR_CUTSCENE_START_SCRIPT = 58;
VAR_CUTSCENE_END_SCRIPT = 59;
- VAR_UNK_SCRIPT = 60;
- VAR_UNK_SCRIPT_2 = 61;
+ VAR_SAVELOAD_SCRIPT = 60;
+ VAR_SAVELOAD_SCRIPT2 = 61;
VAR_CUTSCENEEXIT_KEY = 62;
VAR_RESTART_KEY = 63; // ???