[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.301,1.302 actor.h,1.67,1.68 akos.cpp,1.186,1.187 script_v6he.cpp,2.126,2.127 script_v72he.cpp,2.131,2.132 scumm.cpp,1.233,1.234 scumm.h,1.501,1.502

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26630/scumm

Modified Files:
	actor.cpp actor.h akos.cpp script_v6he.cpp script_v72he.cpp 
	scumm.cpp scumm.h 
Log Message:

talkQueue should be actor specific


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -d -r1.301 -r1.302
--- actor.cpp	24 Sep 2004 21:36:04 -0000	1.301
+++ actor.cpp	28 Sep 2004 00:57:58 -0000	1.302
@@ -64,8 +64,8 @@
 	memset(&cost, 0, sizeof(CostumeData));
 	memset(&walkdata, 0, sizeof(ActorWalkData));
 	walkdata.point3.x = 32000;
-
 	walkScript = 0;
+	memset(talkQueue, 0, sizeof(talkQueue));
 
 	initActor(1);
 }

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- actor.h	21 Sep 2004 21:10:21 -0000	1.67
+++ actor.h	28 Sep 2004 00:57:58 -0000	1.68
@@ -126,6 +126,14 @@
 	uint32 condMask;
 	bool talkUnk;
 	AuxBlock auxBlock;
+
+	struct {
+		int16 posX;
+		int16 posY;
+		int16 color;
+		byte sentence[128];
+	} talkQueue[16];
+
 protected:
 	byte palette[256];
 	int elevation;

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- akos.cpp	27 Sep 2004 23:31:17 -0000	1.186
+++ akos.cpp	28 Sep 2004 00:57:58 -0000	1.187
@@ -1675,12 +1675,12 @@
 			if (_heversion >= 71) {
 				_actorToPrintStrFor = a->number;
 
-				a->talkPosX = _talkQueue[param_1].posX;
-				a->talkPosY = _talkQueue[param_1].posY;
-				a->talkColor = _talkQueue[param_1].color;
+				a->talkPosX = a->talkQueue[param_1].posX;
+				a->talkPosY = a->talkQueue[param_1].posY;
+				a->talkColor = a->talkQueue[param_1].color;
 
 				_string[0].loadDefault();
-				actorTalk(_talkQueue[param_1].sentence);
+				actorTalk(a->talkQueue[param_1].sentence);
 
 			} else if (param_1 != 0) {
 				if (_imuseDigital) {

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.126
retrieving revision 2.127
diff -u -d -r2.126 -r2.127
--- script_v6he.cpp	23 Sep 2004 05:02:15 -0000	2.126
+++ script_v6he.cpp	28 Sep 2004 00:57:59 -0000	2.127
@@ -737,11 +737,11 @@
 		int slot = pop();
 
 		int len = resStrLen(string) + 1;
-		addMessageToStack(string, _talkQueue[slot].sentence, len);
+		addMessageToStack(string, a->talkQueue[slot].sentence, len);
 
-		_talkQueue[slot].posX = a->talkPosX;
-		_talkQueue[slot].posY = a->talkPosY;
-		_talkQueue[slot].color = a->talkColor;
+		a->talkQueue[slot].posX = a->talkPosX;
+		a->talkQueue[slot].posY = a->talkPosY;
+		a->talkQueue[slot].color = a->talkColor;
 		break;
 		}
 	default:

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.131
retrieving revision 2.132
diff -u -d -r2.131 -r2.132
--- script_v72he.cpp	26 Sep 2004 15:29:57 -0000	2.131
+++ script_v72he.cpp	28 Sep 2004 00:57:59 -0000	2.132
@@ -1096,11 +1096,11 @@
 		int slot = pop();
 
 		int len = resStrLen(string) + 1;
-		addMessageToStack(string, _talkQueue[slot].sentence, len);
+		addMessageToStack(string, a->talkQueue[slot].sentence, len);
 
-		_talkQueue[slot].posX = a->talkPosX;
-		_talkQueue[slot].posY = a->talkPosY;
-		_talkQueue[slot].color = a->talkColor;
+		a->talkQueue[slot].posX = a->talkPosX;
+		a->talkQueue[slot].posY = a->talkPosY;
+		a->talkQueue[slot].color = a->talkColor;
 		break;
 		}
 	default:

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- scumm.cpp	27 Sep 2004 10:25:45 -0000	1.233
+++ scumm.cpp	28 Sep 2004 00:57:59 -0000	1.234
@@ -701,8 +701,6 @@
 	memset(_akosQueue, 0, sizeof(_akosQueue));
 	_akosQueuePos = 0;
 
-	memset(_talkQueue, 0, sizeof(_talkQueue));
-
 	//
 	// Init all VARS to 0xFF
 	//

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -d -r1.501 -r1.502
--- scumm.h	26 Sep 2004 15:29:58 -0000	1.501
+++ scumm.h	28 Sep 2004 00:58:00 -0000	1.502
@@ -879,13 +879,6 @@
 	} _akosQueue[32];
 	int16 _akosQueuePos;
 
-	struct {
-		int16 posX;
-		int16 posY;
-		int16 color;
-		byte sentence[128];
-	} _talkQueue[16];
-
 	Common::Rect _actorClipOverride;
 
 	bool akos_increaseAnims(const byte *akos, Actor *a);