[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.284,1.285 actor.h,1.63,1.64 script_v72he.cpp,2.72,2.73

[Travis Howell]

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

Modified Files:
	actor.cpp actor.h script_v72he.cpp 
Log Message:

Use random talk animation in HE 80+ games for now.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -d -r1.284 -r1.285
--- actor.cpp	10 Sep 2004 01:03:01 -0000	1.284
+++ actor.cpp	11 Sep 2004 12:22:06 -0000	1.285
@@ -78,6 +78,7 @@
 		_pos.y = 0;
 		facing = 180;
 		condMask = 1;
+		talkUnk = 0;
 		if (_vm->_version >= 7)
 			visible = false;
 	} else if (mode == 2) {
@@ -1067,6 +1068,19 @@
 
 	bcr->_skipLimb = (skipLimb != 0);
 	
+	if (_vm->_heversion >= 80 && talkUnk == 0) {
+		condMask &= 0xFFFFFC00;
+		condMask |= 1
+;		if (_vm->getTalkingActor() == number) {
+			// Checks if talk sound is active?
+			// Otherwise just do rand animation
+			int rnd = _vm->_rnd.getRandomNumberRng(1, 10);
+;			setTalkCondition(rnd);
+
+		} 
+	}
+	talkUnk == 0;
+
 	// If the actor is partially hidden, redraw it next frame.
 	// Only done for pre-AKOS, though.
 	if (bcr->drawCostume(_vm->virtscr[0], this, drawToBackBuf) & 1) {

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- actor.h	10 Sep 2004 01:03:01 -0000	1.63
+++ actor.h	11 Sep 2004 12:22:06 -0000	1.64
@@ -124,6 +124,7 @@
 	uint16 sound[32];
 	CostumeData cost;
 	uint32 condMask;
+	bool talkUnk;
 protected:
 	byte palette[256];
 	int elevation;

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.72
retrieving revision 2.73
diff -u -d -r2.72 -r2.73
--- script_v72he.cpp	11 Sep 2004 01:44:08 -0000	2.72
+++ script_v72he.cpp	11 Sep 2004 12:22:06 -0000	2.73
@@ -855,7 +855,7 @@
 	case 24:
 		// HE 80+
 		k = pop();
-//		a->byte_45737A = 1;
+		a->talkUnk = 1;
 		a->setTalkCondition(k);
 		debug(1,"o72_actorOps: case 24 (%d)", k);
 		break;