[Scummvm-cvs-logs] SF.net SVN: scummvm: [20994] scummvm/trunk/engines/scumm
cyx at users.sourceforge.net
cyx at users.sourceforge.net
Wed Mar 1 12:09:05 CET 2006
Revision: 20994
Author: cyx
Date: 2006-03-01 12:07:33 -0800 (Wed, 01 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=20994&view=rev
Log Message:
-----------
added 2 SCUMM vars for v1/v2.
Modified Paths:
--------------
scummvm/trunk/engines/scumm/script.cpp
scummvm/trunk/engines/scumm/scumm.h
scummvm/trunk/engines/scumm/vars.cpp
Modified: scummvm/trunk/engines/scumm/script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script.cpp 2006-03-01 18:18:16 UTC (rev 20993)
+++ scummvm/trunk/engines/scumm/script.cpp 2006-03-01 20:07:33 UTC (rev 20994)
@@ -1115,10 +1115,10 @@
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 @@
} 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 {
Modified: scummvm/trunk/engines/scumm/scumm.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm.h 2006-03-01 18:18:16 UTC (rev 20993)
+++ scummvm/trunk/engines/scumm/scumm.h 2006-03-01 20:07:33 UTC (rev 20994)
@@ -1378,6 +1378,8 @@
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()
Modified: scummvm/trunk/engines/scumm/vars.cpp
===================================================================
--- scummvm/trunk/engines/scumm/vars.cpp 2006-03-01 18:18:16 UTC (rev 20993)
+++ scummvm/trunk/engines/scumm/vars.cpp 2006-03-01 20:07:33 UTC (rev 20994)
@@ -154,6 +154,8 @@
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;
More information about the Scummvm-git-logs
mailing list