[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.85,2.86 script_v2.cpp,2.76,2.77 vars.cpp,1.49,1.50

James Brown ender at users.sourceforge.net
Fri May 16 23:05:08 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv30302/scumm

Modified Files:
	intern.h script_v2.cpp vars.cpp 
Log Message:
Name some vars


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.85
retrieving revision 2.86
diff -u -d -r2.85 -r2.86
--- intern.h	17 May 2003 01:57:54 -0000	2.85
+++ intern.h	17 May 2003 06:04:21 -0000	2.86
@@ -278,6 +278,10 @@
 	byte VAR_SENTENCE_VERB;
 	byte VAR_SENTENCE_OBJECT1;
 	byte VAR_SENTENCE_OBJECT2;
+
+	byte VAR_ACTIVE_VERB;
+	byte VAR_ACTIVE_OBJECT1;
+	byte VAR_ACTIVE_OBJECT2;
 };
 
 class Scumm_v4 : public Scumm_v3 {

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.76
retrieving revision 2.77
diff -u -d -r2.76 -r2.77
--- script_v2.cpp	17 May 2003 01:01:05 -0000	2.76
+++ script_v2.cpp	17 May 2003 06:04:21 -0000	2.77
@@ -853,9 +853,9 @@
 		warning("TODO o2_doSentence(%d, %d, %d): execute", st->verb, st->objectA, st->objectB);
 
 		// FIXME / TODO: The following is hackish, and probably incomplete, but it works somewhat.
-		_scummVars[8] = st->verb;
-		_scummVars[9] = st->objectA;
-		_scummVars[10] = st->objectB;
+		_scummVars[VAR_ACTIVE_VERB] = st->verb;
+		_scummVars[VAR_ACTIVE_OBJECT1] = st->objectA;
+		_scummVars[VAR_ACTIVE_OBJECT2] = st->objectB;
 		runVerbCode(st->objectA, st->verb, 0, 0, NULL);
 
 		break;
@@ -867,6 +867,7 @@
 		_scummVars[VAR_SENTENCE_VERB] = st->verb;
 		_scummVars[VAR_SENTENCE_OBJECT1] = st->objectA;
 		_scummVars[VAR_SENTENCE_OBJECT2] = st->objectB;
+
 		o2_drawSentence();
 		break;
 	}

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- vars.cpp	16 May 2003 22:11:49 -0000	1.49
+++ vars.cpp	17 May 2003 06:04:22 -0000	1.50
@@ -106,6 +106,9 @@
 	VAR_OVERRIDE = 5;
 	VAR_MACHINE_SPEED = 6;
 	VAR_CHARCOUNT = 7;
+	VAR_ACTIVE_VERB = 8;
+	VAR_ACTIVE_OBJECT1 = 9;
+	VAR_ACTIVE_OBJECT2 = 10;
 	VAR_NUM_ACTOR = 11;
 	VAR_CURRENT_LIGHTS = 12;
 	VAR_CURRENTDRIVE = 13;





More information about the Scummvm-git-logs mailing list