[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.207,1.208

Eugene Sandulenko sev at users.sourceforge.net
Wed Jan 11 11:16:02 CET 2006


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

Modified Files:
	actor.cpp 
Log Message:
Fix warnings.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- actor.cpp	11 Jan 2006 19:10:08 -0000	1.207
+++ actor.cpp	11 Jan 2006 19:14:57 -0000	1.208
@@ -960,13 +960,17 @@
 			return kFrameIHNMGesture;
 		case kFrameWait:
 			return kFrameIHNMWait;
+		case kFrameGive:
+		case kFramePickUp:
+		case kFrameLook:
+			error("Actor::getFrameType() unknown frame type %d", frameType);
+			return kFrameIHNMStand;
 		}
 	}
 	error("Actor::getFrameType() unknown frame type %d", frameType);
 }
 
 ActorFrameRange *Actor::getActorFrameRange(uint16 actorId, int frameType) {
-	ActorFrameRange * fr = NULL;
 	ActorData *actor;
 	int fourDirection;
 	static ActorFrameRange def = {0, 0};





More information about the Scummvm-git-logs mailing list