[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.545,1.546 scumm.cpp,1.381,1.382 actor.cpp,1.327,1.328

Max Horn fingolfin at users.sourceforge.net
Thu Mar 24 16:38:32 CET 2005


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

Modified Files:
	scumm.h scumm.cpp actor.cpp 
Log Message:
Do not use (non-const) local static variables

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.545
retrieving revision 1.546
diff -u -d -r1.545 -r1.546
--- scumm.h	24 Mar 2005 03:22:32 -0000	1.545
+++ scumm.h	25 Mar 2005 00:37:14 -0000	1.546
@@ -836,6 +836,9 @@
 	SentenceTab _sentence[NUM_SENTENCE];
 	StringTab _string[6];
 	int16 _talkDelay;
+	int _NES_lastTalkingActor;
+	int _NES_talkColor;
+
 	void actorTalk(const byte *msg);
 	void stopTalk();
 	int getTalkingActor();		// Wrapper around VAR_TALK_ACTOR for V1 Maniac

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -d -r1.381 -r1.382
--- scumm.cpp	24 Mar 2005 21:34:35 -0000	1.381
+++ scumm.cpp	25 Mar 2005 00:37:14 -0000	1.382
@@ -852,6 +852,8 @@
 	_confirmExit = false;
 	_voiceMode = 0;
 	_talkDelay = 0;
+	_NES_lastTalkingActor = 0;
+	_NES_talkColor = 0;
 	_keepText = false;
 	_existLanguageFile = false;
 	_languageBuffer = NULL;

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -d -r1.327 -r1.328
--- actor.cpp	21 Mar 2005 23:51:28 -0000	1.327
+++ actor.cpp	25 Mar 2005 00:37:14 -0000	1.328
@@ -1287,12 +1287,10 @@
 	if (_heversion >= 72 || getTalkingActor() > 0x7F) {
 		_charsetColor = (byte)_string[0].color;
 	} else if (_features & GF_NES) {
-		static int NES_lastActor = 0;
-		static int NES_color = 0;
-		if (NES_lastActor != getTalkingActor())
-			NES_color ^= 1;
-		NES_lastActor = getTalkingActor();
-		_charsetColor = NES_color;
+		if (_NES_lastTalkingActor != getTalkingActor())
+			_NES_talkColor ^= 1;
+		_NES_lastTalkingActor = getTalkingActor();
+		_charsetColor = _NES_talkColor;
 	} else {
 		a = derefActor(getTalkingActor(), "actorTalk(2)");
 		_charsetColor = a->_talkColor;





More information about the Scummvm-git-logs mailing list