[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.344,1.345 scumm.cpp,1.452,1.453 scumm.h,1.597,1.598 vars.cpp,1.126,1.127

[kirben]

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

Modified Files:
	actor.cpp scumm.cpp scumm.h vars.cpp 
Log Message:

HE98+ includes extra VAR checks at this point.
Fixes salesmen freeze in freddi4.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -d -r1.344 -r1.345
--- actor.cpp	20 Apr 2005 18:20:44 -0000	1.344
+++ actor.cpp	21 Apr 2005 03:29:16 -0000	1.345
@@ -1445,8 +1445,11 @@
 			_palette[i] = 0xFF;
 	}
 
-	if (_vm->_heversion >= 72 && _vm->getTalkingActor() == _number)
-		_vm->setTalkingActor(0);
+	if (_vm->_heversion >= 71 && _vm->getTalkingActor() == _number) {
+		if (_vm->_heversion <= 95 || (_vm->_heversion >= 98 && _vm->VAR(_vm->VAR_SKIP_RESET_TALK_ACTOR) == 0)) {
+			_vm->setTalkingActor(0);
+		}
+	}
 }
 
 void Actor::startWalkActor(int destX, int destY, int dir) {

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -d -r1.452 -r1.453
--- scumm.cpp	20 Apr 2005 23:53:28 -0000	1.452
+++ scumm.cpp	21 Apr 2005 03:29:30 -0000	1.453
@@ -1036,6 +1036,7 @@
 	VAR_MUSIC_BUNDLE_LOADED = 0xFF;
 	VAR_VOICE_BUNDLE_LOADED = 0xFF;
 
+	VAR_SKIP_RESET_TALK_ACTOR = 0xFF;
 	VAR_MUSIC_CHANNEL = 0xFF;
 	VAR_SOUND_CHANNEL = 0xFF;
 

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.597
retrieving revision 1.598
diff -u -d -r1.597 -r1.598
--- scumm.h	20 Apr 2005 23:53:28 -0000	1.597
+++ scumm.h	21 Apr 2005 03:29:30 -0000	1.598
@@ -1321,6 +1321,7 @@
 	byte VAR_CLICK_AREA;
 
 	// HE specific variables
+	byte VAR_SKIP_RESET_TALK_ACTOR;
 	byte VAR_MUSIC_CHANNEL;
 	byte VAR_SOUND_CHANNEL;
 

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- vars.cpp	20 Apr 2005 23:13:11 -0000	1.126
+++ vars.cpp	21 Apr 2005 03:29:31 -0000	1.127
@@ -281,6 +281,9 @@
 		VAR_NUM_SPRITES = 106;
 		VAR_WIZ_TCOLOR = 117;
 	}
+	if (_heversion >= 98) {
+		VAR_SKIP_RESET_TALK_ACTOR = 125;
+	}
 	if (_heversion >= 99) {
 		VAR_NUM_PALETTES = 130;
 		VAR_NUM_UNK = 131;