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

renamed VAR_UNK_SCRIPT to VAR_SAVELOAD_SCRIPT; fixed V8 save/load (no (known) VAR_SAVELOAD_SCRIPT value for V8)

Browse source 
svn-id: r7485
This commit is contained in:
Max Horn 2003-05-13 17:51:56 +00:00
parent cb8d07fd62
commit 2838aae2f4
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scumm/scumm.h
View file

@ -1143,8 +1143,8 @@ public:
byte VAR_RIGHTBTN_HOLD; byte VAR_RIGHTBTN_HOLD;
byte VAR_MOUSE_BUTTONS; byte VAR_MOUSE_BUTTONS;
byte VAR_MOUSE_HOLD; byte VAR_MOUSE_HOLD;
byte VAR_UNK_SCRIPT; byte VAR_SAVELOAD_SCRIPT;
byte VAR_UNK_SCRIPT_2; byte VAR_SAVELOAD_SCRIPT2;
byte VAR_DEFAULT_TALK_DELAY; byte VAR_DEFAULT_TALK_DELAY;
byte VAR_CHARSET_MASK; byte VAR_CHARSET_MASK;

12
scumm/scummvm.cpp
View file

@ -501,8 +501,8 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst)
VAR_RIGHTBTN_HOLD = 0xFF; VAR_RIGHTBTN_HOLD = 0xFF;
VAR_MOUSE_BUTTONS = 0xFF; VAR_MOUSE_BUTTONS = 0xFF;
VAR_MOUSE_HOLD = 0xFF; VAR_MOUSE_HOLD = 0xFF;
VAR_UNK_SCRIPT = 0xFF; VAR_SAVELOAD_SCRIPT = 0xFF;
VAR_UNK_SCRIPT_2 = 0xFF; VAR_SAVELOAD_SCRIPT2 = 0xFF;
VAR_DEFAULT_TALK_DELAY = 0xFF; VAR_DEFAULT_TALK_DELAY = 0xFF;
VAR_CHARSET_MASK = 0xFF; VAR_CHARSET_MASK = 0xFF;
@ -1767,13 +1767,13 @@ void Scumm::processKbd() {
} else } else
exitCutscene(); exitCutscene();
} else if (_lastKeyHit == saveloadkey && _currentRoom != 0) { } else if (_lastKeyHit == saveloadkey && _currentRoom != 0) {
if (_features & GF_AFTER_V7) if (VAR_SAVELOAD_SCRIPT != 0xFF)
runScript(VAR(VAR_UNK_SCRIPT), 0, 0, 0); runScript(VAR(VAR_SAVELOAD_SCRIPT), 0, 0, 0);
saveloadDialog(); // Display NewGui saveloadDialog(); // Display NewGui
if (_features & GF_AFTER_V7) if (VAR_SAVELOAD_SCRIPT2 != 0xFF)
runScript(VAR(VAR_UNK_SCRIPT_2), 0, 0, 0); runScript(VAR(VAR_SAVELOAD_SCRIPT2), 0, 0, 0);
return; return;
} else if (VAR_TALKSTOP_KEY != 0xFF && _lastKeyHit == VAR(VAR_TALKSTOP_KEY)) { } else if (VAR_TALKSTOP_KEY != 0xFF && _lastKeyHit == VAR(VAR_TALKSTOP_KEY)) {
_talkDelay = 0; _talkDelay = 0;

4
scumm/vars.cpp
View file

@ -184,8 +184,8 @@ void Scumm_v7::setupScummVars() {
VAR_HOOK_SCRIPT = 57; VAR_HOOK_SCRIPT = 57;
VAR_CUTSCENE_START_SCRIPT = 58; VAR_CUTSCENE_START_SCRIPT = 58;
VAR_CUTSCENE_END_SCRIPT = 59; VAR_CUTSCENE_END_SCRIPT = 59;
VAR_UNK_SCRIPT = 60; VAR_SAVELOAD_SCRIPT = 60;
VAR_UNK_SCRIPT_2 = 61; VAR_SAVELOAD_SCRIPT2 = 61;
VAR_CUTSCENEEXIT_KEY = 62; VAR_CUTSCENEEXIT_KEY = 62;
VAR_RESTART_KEY = 63; // ??? VAR_RESTART_KEY = 63; // ???