[Scummvm-cvs-logs] CVS: scummvm/queen logic.cpp,1.80,1.81 talk.cpp,1.31,1.32

[David Eriksson]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv882/queen

Modified Files:
	logic.cpp talk.cpp 
Log Message:
Small fixes.


Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- logic.cpp	7 Nov 2003 10:57:20 -0000	1.80
+++ logic.cpp	7 Nov 2003 14:05:45 -0000	1.81
@@ -1274,8 +1274,10 @@
 		}
 	}
 
-	if (!actor)
-		error ("Actor '%s' not found", actorName);
+	if (!actor) {
+		warning("Actor '%s' not found, using default", actorName);
+		actor = 1;
+	}
 
 	pp->actor = &_actorData[actor];
 	pp->bankNum = pp->actor->bankNum;

Index: talk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- talk.cpp	7 Nov 2003 00:54:41 -0000	1.31
+++ talk.cpp	7 Nov 2003 14:05:45 -0000	1.32
@@ -127,7 +127,12 @@
 	load(filename);
 
 	Person person;
+	memset(&person, 0, sizeof(Person));
 	_logic->personSetData(personInRoom, "", false, &person);
+
+	if (NULL == person.name) {
+		error("Invalid person object");
+	}
 	
 	int16 oldLevel = 0;
 	bool personWalking = false;		// OWALK in talk.c