diff options
| author | Gregory Montoir | 2006-03-01 20:07:33 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2006-03-01 20:07:33 +0000 |
| commit | 9a9475169da1f25e85791481d07d92ac872c22ba (patch) | |
| tree | 786d6e02c161bbda7219ec903bc6c7ef3c780da1 /engines | |
| parent | ce63f2bc38ada593b24172a0cf6a59b263941c4e (diff) | |
| download | scummvm-rg350-9a9475169da1f25e85791481d07d92ac872c22ba.tar.gz scummvm-rg350-9a9475169da1f25e85791481d07d92ac872c22ba.tar.bz2 scummvm-rg350-9a9475169da1f25e85791481d07d92ac872c22ba.zip | |
added 2 SCUMM vars for v1/v2.
svn-id: r20994
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/script.cpp | 14 | ||||
| -rw-r--r-- | engines/scumm/scumm.h | 2 | ||||
| -rw-r--r-- | engines/scumm/vars.cpp | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp index f9871ec190..594a7f4128 100644 --- a/engines/scumm/script.cpp +++ b/engines/scumm/script.cpp @@ -1115,10 +1115,10 @@ void ScummEngine::checkAndRunSentenceScript() { return; if (_game.version <= 2) { - _scummVars[VAR_ACTIVE_VERB] = _sentence[_sentenceNum].verb; - _scummVars[VAR_ACTIVE_OBJECT1] = _sentence[_sentenceNum].objectA; - _scummVars[VAR_ACTIVE_OBJECT2] = _sentence[_sentenceNum].objectB; - _scummVars[VAR_VERB_ALLOWED] = (0 != getVerbEntrypoint(_sentence[_sentenceNum].objectA, _sentence[_sentenceNum].verb)); + VAR(VAR_ACTIVE_VERB) = _sentence[_sentenceNum].verb; + VAR(VAR_ACTIVE_OBJECT1) = _sentence[_sentenceNum].objectA; + VAR(VAR_ACTIVE_OBJECT2) = _sentence[_sentenceNum].objectB; + VAR(VAR_VERB_ALLOWED) = (0 != getVerbEntrypoint(_sentence[_sentenceNum].objectA, _sentence[_sentenceNum].verb)); } else { localParamList[0] = _sentence[_sentenceNum].verb; localParamList[1] = _sentence[_sentenceNum].objectA; @@ -1147,13 +1147,13 @@ void ScummEngine::runInputScript(int a, int cmd, int mode) { } else if (_game.version <= 2) { verbScript = 4; - _scummVars[VAR_CLICK_AREA] = a; + VAR(VAR_CLICK_AREA) = a; switch (a) { case 1: // Verb clicked - _scummVars[33] = cmd; + VAR(VAR_CLICK_VERB) = cmd; break; case 3: // Inventory clicked - _scummVars[35] = cmd; + VAR(VAR_CLICK_OBJECT) = cmd; break; } } else { diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index 3ec8fb8eed..0bb99c937e 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -1378,6 +1378,8 @@ public: byte VAR_ACTIVE_OBJECT1; byte VAR_ACTIVE_OBJECT2; byte VAR_CLICK_AREA; + byte VAR_CLICK_VERB; + byte VAR_CLICK_OBJECT; // HE specific variables byte VAR_REDRAW_ALL_ACTORS; // Used in setActorRedrawFlags() diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp index 905477da01..879524f519 100644 --- a/engines/scumm/vars.cpp +++ b/engines/scumm/vars.cpp @@ -154,6 +154,8 @@ void ScummEngine_v2::setupScummVars() { VAR_VIRT_MOUSE_X = 30; VAR_VIRT_MOUSE_Y = 31; VAR_CLICK_AREA = 32; + VAR_CLICK_VERB = 33; + VAR_CLICK_OBJECT = 35; VAR_ROOM_RESOURCE = 36; VAR_LAST_SOUND = 37; VAR_BACKUP_VERB = 38; |