[Scummvm-cvs-logs] SF.net SVN: scummvm:[45212] scummvm/trunk/engines/teenagent

megath at users.sourceforge.net megath at users.sourceforge.net
Sun Oct 18 12:32:08 CEST 2009


Revision: 45212
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45212&view=rev
Author:   megath
Date:     2009-10-18 10:32:08 +0000 (Sun, 18 Oct 2009)

Log Message:
-----------
better actor positioning

Modified Paths:
--------------
    scummvm/trunk/engines/teenagent/scene.cpp
    scummvm/trunk/engines/teenagent/scene.h

Modified: scummvm/trunk/engines/teenagent/scene.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/scene.cpp	2009-10-18 10:21:53 UTC (rev 45211)
+++ scummvm/trunk/engines/teenagent/scene.cpp	2009-10-18 10:32:08 UTC (rev 45212)
@@ -372,7 +372,8 @@
 			if (s != NULL) {
 				animation_position[i] = s->render(surface);
 				busy = true;
-				got_any_animation = true;
+				if (!a->paused && !a->loop)
+					got_any_animation = true;
 				continue;
 			}
 
@@ -406,7 +407,7 @@
 			} else if (!hide_actor) {
 				actor_animation.free();
 
-				if (destination != position) {
+				if (progress < progress_total) {
 					Common::Point dp(destination.x - position0.x, destination.y - position0.y);
 					int o;
 					if (ABS(dp.x) > ABS(dp.y))

Modified: scummvm/trunk/engines/teenagent/scene.h
===================================================================
--- scummvm/trunk/engines/teenagent/scene.h	2009-10-18 10:21:53 UTC (rev 45211)
+++ scummvm/trunk/engines/teenagent/scene.h	2009-10-18 10:32:08 UTC (rev 45212)
@@ -94,8 +94,8 @@
 
 	void dump() const {
 		debug(0, "event[%d]: \"%s\"[%02x], animation: %u, dst: (%d, %d) [%u], scene: %u, ons: %u, lan: %u, object: %u, music: %u, sound: %u",
-		      (int)type, message.c_str(), color, animation, dst.x, dst.y, orientation, scene, ons, lan, object, music, sound
-		     );
+			(int)type, message.c_str(), color, animation, dst.x, dst.y, orientation, scene, ons, lan, object, music, sound
+		);
 	}
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list