[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.221,1.222 scumm.h,1.361,1.362

[Travis Howell]

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

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

Only needed for V1 Maniac.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- actor.cpp	16 Jan 2004 10:45:55 -0000	1.221
+++ actor.cpp	16 Jan 2004 10:51:48 -0000	1.222
@@ -781,17 +781,17 @@
 	needRedraw = true;
 }
 
-// Maniac doesn't have a ScummVar for VAR_TALK_ACTOR, and just uses
+// V1 Maniac doesn't have a ScummVar for VAR_TALK_ACTOR, and just uses
 // an internal variable. Emulate this to prevent overwriting script vars...
 int ScummEngine::talkingActor() {
-	if (_gameId == GID_MANIAC)
+	if (_gameId == GID_MANIAC && _version == 1)
 		return _V1_talkingActor;
 	else
 		return VAR(VAR_TALK_ACTOR);
 };
 
 void ScummEngine::talkingActor(int value) {
-	if (_gameId == GID_MANIAC)
+	if (_gameId == GID_MANIAC && _version == 1)
 		_V1_talkingActor = value;
 	else
 		VAR(VAR_TALK_ACTOR) = value;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -d -r1.361 -r1.362
--- scumm.h	16 Jan 2004 10:45:56 -0000	1.361
+++ scumm.h	16 Jan 2004 10:51:48 -0000	1.362
@@ -778,7 +778,7 @@
 	int16 _talkDelay;
 	void actorTalk();
 	void stopTalk();
-	int talkingActor();		// Wrapper around VAR_TALK_ACTOR for V1/V2 purposes
+	int talkingActor();		// Wrapper around VAR_TALK_ACTOR for V1 Maniac
 	void talkingActor(int variable);
 
 	// Costume class