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

[megath at users.sourceforge.net]

Revision: 45950
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45950&view=rev
Author:   megath
Date:     2009-11-17 08:57:51 +0000 (Tue, 17 Nov 2009)

Log Message:
-----------
corrected overlay z-order based on bottom coordinate (fixes chair in captain's room, and RGB chief table z-order)

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

Modified: scummvm/trunk/engines/teenagent/scene.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/scene.cpp	2009-11-17 08:15:00 UTC (rev 45949)
+++ scummvm/trunk/engines/teenagent/scene.cpp	2009-11-17 08:57:51 UTC (rev 45950)
@@ -637,6 +637,12 @@
 			}
 		}
 
+		if (on.pixels != NULL && on.y + on.h < actor_animation_position.bottom && debug_features.feature[DebugFeatures::kShowOn]) {
+			if (_id != 16 || getOns(16)[0] != 0) {
+				on.render(surface); //do not render boat on isle. I double checked all callbacks, there's no code switching off the boat :(
+			}
+		}
+
 		{
 			Surface *mark = actor_animation.currentFrame();
 			if (mark != NULL) {
@@ -692,7 +698,7 @@
 		}
 
 		//render on
-		if (on.pixels != NULL && debug_features.feature[DebugFeatures::kShowOn]) {
+		if (on.pixels != NULL && on.y + on.h >= actor_animation_position.bottom && debug_features.feature[DebugFeatures::kShowOn]) {
 			if (_id != 16 || getOns(16)[0] != 0) {
 				on.render(surface); //do not render boat on isle. I double checked all callbacks, there's no code switching off the boat :(
 			}


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