[Scummvm-cvs-logs] CVS: scummvm script_v2.cpp,1.69,1.70

James Brown ender at users.sourceforge.net
Wed Jun 26 04:33:02 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv31036

Modified Files:
	script_v2.cpp 
Log Message:
Add invalid variable checks for The Dig



Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- script_v2.cpp	4 Jun 2002 23:32:53 -0000	1.69
+++ script_v2.cpp	26 Jun 2002 11:32:21 -0000	1.70
@@ -2369,7 +2369,7 @@
 	case 226:{										/* wait until actor drawn */
 			Actor *a = derefActorSafe(pop(), "o6_wait:226");
 			int offs = (int16) fetchScriptWord();
-			if (a->isInCurrentRoom() && a->needRedraw) {
+			if (a && a->isInCurrentRoom() && a->needRedraw) {
 				_scriptPointer += offs;
 				o6_breakHere();
 			}
@@ -2378,7 +2378,7 @@
 	case 232:{										/* wait until actor stops turning */
 			Actor *a = derefActorSafe(pop(), "o6_wait:226");
 			int offs = (int16) fetchScriptWord();
-			if (a->isInCurrentRoom() && a->moving & MF_TURN) {
+			if (a && a->isInCurrentRoom() && a->moving & MF_TURN) {
 				_scriptPointer += offs;
 				o6_breakHere();
 			}





More information about the Scummvm-git-logs mailing list