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

[megath at users.sourceforge.net]

Revision: 46911
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46911&view=rev
Author:   megath
Date:     2010-01-03 01:25:08 +0000 (Sun, 03 Jan 2010)

Log Message:
-----------
moved scripted mark's animation after all sprites

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

Modified: scummvm/trunk/engines/teenagent/scene.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/scene.cpp	2010-01-03 01:10:07 UTC (rev 46910)
+++ scummvm/trunk/engines/teenagent/scene.cpp	2010-01-03 01:25:08 UTC (rev 46911)
@@ -423,6 +423,7 @@
 }
 
 void Scene::playActorAnimation(uint id, bool loop, bool ignore) {
+	debug(0, "playActorAnimation(%u, loop:%s, ignore:%s)", id, loop?"true":"false", ignore?"true":"false");
 	Common::SeekableReadStream *s = Resources::instance()->loadLan(id + 1);
 	if (s == NULL)
 		error("playing animation %u failed", id);
@@ -664,16 +665,9 @@
 			s->render(surface);
 		}
 
-		{
-			Surface *mark = actor_animation.currentFrame();
-			if (mark != NULL) {
-				actor_animation_position = mark->render(surface);
-				if (!actor_animation.ignore) 
-					busy = true;
-				else 
-					busy = false;
-				got_any_animation = true;
-			} else if (!hide_actor) {
+		Surface *mark = actor_animation.currentFrame();
+		if (mark == NULL) {
+			if (!hide_actor) {
 				actor_animation.free();
 				uint zoom = lookupZoom(position.y);
 
@@ -730,6 +724,15 @@
 			Surface *s = *z_order_it;
 			s->render(surface);
 		}
+		if (mark != NULL) {
+			debug("pos.y = %d, anim.y = %d", position.y, mark->y + mark->h);
+			actor_animation_position = mark->render(surface);
+			if (!actor_animation.ignore) 
+				busy = true;
+			else 
+				busy = false;
+			got_any_animation = true;
+		}
 
 		if (!message.empty()) {
 			bool visible = true;


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