[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.37,1.38 actor.h,1.7,1.8 saveload.cpp,1.35,1.36 script_v6.cpp,1.13,1.14 script_v8.cpp,2.7,2.8 string.cpp,1.58,1.59

[Max Horn]

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

Modified Files:
	actor.cpp actor.h saveload.cpp script_v6.cpp script_v8.cpp 
	string.cpp 
Log Message:
renamed new_1, new_2, new_3 in class Actor

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- actor.cpp	18 Dec 2002 23:45:52 -0000	1.37
+++ actor.cpp	23 Dec 2002 14:16:43 -0000	1.38
@@ -47,8 +47,8 @@
 	elevation = 0;
 	width = 24;
 	talkColor = 15;
-	new_2 = 0;
-	new_1 = -80;
+	talkPosX = -80;
+	talkPosY = 0;
 	scaley = scalex = 0xFF;
 	charset = 0;
 	sound[0] = 0;
@@ -71,7 +71,7 @@
 
 	ignoreBoxes = 0;
 	forceClip = 0;
-	new_3 = 0;
+	ignoreTurns = false;
 	initFrame = 1;
 	walkFrame = 2;
 	standFrame = 3;

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- actor.h	15 Dec 2002 21:54:47 -0000	1.7
+++ actor.h	23 Dec 2002 14:16:43 -0000	1.8
@@ -92,9 +92,9 @@
 	byte frame;
 	byte walkbox;
 	byte animProgress, animSpeed;
-	int16 new_1, new_2;
+	int16 talkPosX, talkPosY;
 	uint16 talk_script, walk_script;
-	byte new_3;
+	bool ignoreTurns;	// TODO - we do not honor this flag at all currently!
 	int8 layer;
 	ActorWalkData walkdata;
 	int16 animVariable[16];

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- saveload.cpp	22 Dec 2002 21:58:15 -0000	1.35
+++ saveload.cpp	23 Dec 2002 14:16:43 -0000	1.36
@@ -280,9 +280,9 @@
 		MKLINE(Actor, needBgReset, sleByte, VER_V8),
 		MKLINE(Actor, costumeNeedsInit, sleByte, VER_V8),
 
-		MKLINE(Actor, new_1, sleInt16, VER_V8),
-		MKLINE(Actor, new_2, sleInt16, VER_V8),
-		MKLINE(Actor, new_3, sleByte, VER_V8),
+		MKLINE(Actor, talkPosX, sleInt16, VER_V8),
+		MKLINE(Actor, talkPosY, sleInt16, VER_V8),
+		MKLINE(Actor, ignoreTurns, sleByte, VER_V8),
 
 		MKLINE(Actor, layer, sleByte, VER_V8),
 

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- script_v6.cpp	23 Dec 2002 12:50:38 -0000	1.13
+++ script_v6.cpp	23 Dec 2002 14:16:43 -0000	1.14
@@ -1659,6 +1659,7 @@
 		a->standFrame = pop();
 		break;
 	case 82:
+		// FIXME: what does this opcode do ???
 		pop();
 		pop();
 		pop();
@@ -1734,18 +1735,18 @@
 		a->shadow_mode = pop();
 		break;
 	case 99:
-		a->new_1 = pop();
-		a->new_2 = pop();
+		a->talkPosX = pop();
+		a->talkPosY = pop();
 		break;
 	case 198:										/* set anim variable */
 		i = pop();									/* value */
 		a->setAnimVar(pop(), i);
 		break;
 	case 215:
-		a->new_3 = 1;
+		a->ignoreTurns = true;
 		break;
 	case 216:
-		a->new_3 = 0;
+		a->ignoreTurns = false;
 		break;
 	case 217:
 		a->initActor(2);

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -d -r2.7 -r2.8
--- script_v8.cpp	23 Dec 2002 12:50:38 -0000	2.7
+++ script_v8.cpp	23 Dec 2002 14:16:43 -0000	2.8
@@ -161,8 +161,8 @@
 		OPCODE(o8_unknown),
 		OPCODE(o8_unknown),
 		/* 64 */
-		OPCODE(o6_jumpFalse),	// Not sure about which of these two is which (false==if or true==if ?!?)...
-		OPCODE(o6_jumpTrue),	// ... since "if" could mean 'jump "if"' or 'execute following code "if", otherwise jump'.
+		OPCODE(o6_jumpFalse),
+		OPCODE(o6_jumpTrue),
 		OPCODE(o6_jump),
 		OPCODE(o6_breakHere),
 		/* 68 */

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- string.cpp	22 Dec 2002 03:12:50 -0000	1.58
+++ string.cpp	23 Dec 2002 14:16:43 -0000	1.59
@@ -477,16 +477,16 @@
 			if (_string[0].xpos > _realWidth - 80)
 				_string[0].xpos = _realWidth - 80;
 		} else {
-			s = a->scaley * a->new_1 / 0xFF;
-			_string[0].ypos = ((a->new_1 - s) >> 1) + s - a->elevation + a->y;
+			s = a->scaley * a->talkPosX / 0xFF;
+			_string[0].ypos = ((a->talkPosX - s) >> 1) + s - a->elevation + a->y;
 			if (_string[0].ypos < 1)
 				_string[0].ypos = 1;
 
 			if (_string[0].ypos < camera._cur.y - (_realHeight / 2))
 				_string[0].ypos = camera._cur.y - (_realHeight / 2);
 
-			s = a->scalex * a->new_2 / 0xFF;
-			_string[0].xpos = ((a->new_2 - s) >> 1) + s + a->x - camera._cur.x + (_realWidth / 2);
+			s = a->scalex * a->talkPosY / 0xFF;
+			_string[0].xpos = ((a->talkPosY - s) >> 1) + s + a->x - camera._cur.x + (_realWidth / 2);
 			if (_string[0].xpos < 80)
 				_string[0].xpos = 80;
 			if (_string[0].xpos > _realWidth - 80)