[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.83,2.84 script_v2.cpp,2.73,2.74 vars.cpp,1.48,1.49

[Max Horn]

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

Modified Files:
	intern.h script_v2.cpp vars.cpp 
Log Message:
cleanup

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.83
retrieving revision 2.84
diff -u -d -r2.83 -r2.84
--- intern.h	14 May 2003 20:37:52 -0000	2.83
+++ intern.h	16 May 2003 22:11:48 -0000	2.84
@@ -274,6 +274,10 @@
 	void o2_waitForSentence();
 	void o2_walkActorTo();
 	void o2_walkActorToObject();
+
+	byte VAR_SENTENCE_VERB;
+	byte VAR_SENTENCE_OBJECT1;
+	byte VAR_SENTENCE_OBJECT2;
 };
 
 class Scumm_v4 : public Scumm_v3 {

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.73
retrieving revision 2.74
diff -u -d -r2.73 -r2.74
--- script_v2.cpp	16 May 2003 12:58:49 -0000	2.73
+++ script_v2.cpp	16 May 2003 22:11:49 -0000	2.74
@@ -866,27 +866,28 @@
 		_sentenceNum--;
 		warning("TODO o2_doSentence(%d, %d, %d): print", st->verb, st->objectA, st->objectB);
 		
-		_scummVars[26] = st->verb;
-		_scummVars[27] = st->objectA;
-		_scummVars[28] = st->objectB;
+		_scummVars[VAR_SENTENCE_VERB] = st->verb;
+		_scummVars[VAR_SENTENCE_OBJECT1] = st->objectA;
+		_scummVars[VAR_SENTENCE_OBJECT2] = st->objectB;
 		o2_drawSentence();
 		break;
 	}
 }
 
 void Scumm_v2::o2_drawSentence() {
-	byte *verb_bit = getResourceAddress(rtVerb, getVerbSlot(_scummVars[26],0));
+	int slot = getVerbSlot(_scummVars[VAR_SENTENCE_VERB],0);
+	byte *verb_bit = getResourceAddress(rtVerb, slot);
 	byte *name_bit, *name2_bit;
 
 	if (_scummVars[27] > 0) {
-		name_bit = getObjOrActorName(_scummVars[27]);
+		name_bit = getObjOrActorName(_scummVars[VAR_SENTENCE_OBJECT1]);
 	} else {
 		name_bit = NULL;
 //(byte*)strdup("");
 	}
 
 	if (_scummVars[28] > 0) {
-		name2_bit = getObjOrActorName(_scummVars[28]);
+		name2_bit = getObjOrActorName(_scummVars[VAR_SENTENCE_OBJECT2]);
 	} else {
 		name2_bit = NULL;
 //(byte*)strdup("");

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- vars.cpp	14 May 2003 13:30:52 -0000	1.48
+++ vars.cpp	16 May 2003 22:11:49 -0000	1.49
@@ -115,6 +115,9 @@
 	VAR_CAMERA_MIN_X = 23;
 	VAR_CAMERA_MAX_X = 24;
 	VAR_TIMER_NEXT = 25;
+	VAR_SENTENCE_VERB = 26;
+	VAR_SENTENCE_OBJECT1 = 27;
+	VAR_SENTENCE_OBJECT2 = 28;
 	VAR_VIRT_MOUSE_X = 30;
 	VAR_VIRT_MOUSE_Y = 31;
 	VAR_ROOM_RESOURCE = 36;