[Scummvm-cvs-logs] CVS: scummvm/queen logic.cpp,1.35,1.36

[David Eriksson]

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

Modified Files:
	logic.cpp 
Log Message:
Compare correct actor names.


Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- logic.cpp	13 Oct 2003 14:31:59 -0000	1.35
+++ logic.cpp	14 Oct 2003 06:41:08 -0000	1.36
@@ -1138,18 +1138,21 @@
 	}
 
 	// search for a matching actor
-	uint16 actor = 1;
+	uint16 actor = 0;
 	for (i = 1; i <= _numActors; ++i) {
 		ActorData *pad = &_actorData[i];
 		if (pad->room == _currentRoom) {
 			if (_gameState[pad->gameStateSlot] == pad->gameStateValue) {
-				if ((bobNum > 0 && bobNum == pad->bobNum) || strcmp(pp->name, actorName) == 0) {
+				if ((bobNum > 0 && bobNum == pad->bobNum) || strcmp(_aName[pad->name], actorName) == 0) {
 					actor = i;
 					break;
 				}
 			}
 		}
 	}
+
+	if (!actor)
+		error ("Actor '%s' not found", actorName);
 
 	pp->actor = &_actorData[actor];
 	pp->bankNum = pp->actor->bankNum;