[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.142,2.143 script_v72he.cpp,2.276,2.277

kirben kirben at users.sourceforge.net
Sat Apr 30 18:03:59 CEST 2005


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

Modified Files:
	script_v100he.cpp script_v72he.cpp 
Log Message:

Add missing safety checks.


Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.142
retrieving revision 2.143
diff -u -d -r2.142 -r2.143
--- script_v100he.cpp	30 Apr 2005 05:47:09 -0000	2.142
+++ script_v100he.cpp	1 May 2005 01:02:34 -0000	2.143
@@ -2779,8 +2779,10 @@
 		_string[m].loadDefault();
 		if (n) {
 			_actorToPrintStrFor = pop();
-			a = derefActorSafe(_actorToPrintStrFor, "decodeParseString");
-			_string[0].color = a->_talkColor;
+			if (_actorToPrintStrFor != 0xFF) {
+				a = derefActorSafe(_actorToPrintStrFor, "decodeParseString");
+				_string[0].color = a->_talkColor;
+			}
 		}
 		break;
 	case 92:

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.276
retrieving revision 2.277
diff -u -d -r2.276 -r2.277
--- script_v72he.cpp	27 Apr 2005 14:47:10 -0000	2.276
+++ script_v72he.cpp	1 May 2005 01:02:34 -0000	2.277
@@ -1570,10 +1570,12 @@
 	Actor *a;
 
 	_actorToPrintStrFor = pop();
-	a = derefActorSafe(_actorToPrintStrFor, "o72_talkActor");
 
 	_string[0].loadDefault();
-	_string[0].color = a->_talkColor;
+	if (_actorToPrintStrFor != 0xFF) {
+		a = derefActorSafe(_actorToPrintStrFor, "o72_talkActor");
+		_string[0].color = a->_talkColor;
+	}
 	actorTalk(_scriptPointer);
 
 	_scriptPointer += resStrLen(_scriptPointer) + 1;
@@ -2258,8 +2260,10 @@
 		_string[m].loadDefault();
 		if (n) {
 			_actorToPrintStrFor = pop();
-			a = derefActorSafe(_actorToPrintStrFor, "decodeParseString");
-			_string[0].color = a->_talkColor;
+			if (_actorToPrintStrFor != 0xFF) {
+				a = derefActorSafe(_actorToPrintStrFor, "decodeParseString");
+				_string[0].color = a->_talkColor;
+			}
 		}
 		break;
 	case 0xFF:





More information about the Scummvm-git-logs mailing list