libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-25 22:07:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

added 2 SCUMM vars for v1/v2.

Browse Source 
svn-id: r20994
This commit is contained in:
Gregory Montoir 2006-03-01 20:07:33 +00:00
parent ce63f2bc38
commit 9a9475169d
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/scumm/script.cpp
View File

@ -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 {

2
engines/scumm/scumm.h
View File

@ -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()

2
engines/scumm/vars.cpp
View File

@ -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;