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

svn-id: r45950

1 files changed, 7 insertions, 1 deletions

diff --git a/engines/teenagent/scene.cpp b/engines/teenagent/scene.cpp
index d1b3a863e5..31f5b57605 100644
--- a/engines/teenagent/scene.cpp
+++ b/engines/teenagent/scene.cpp
@@ -637,6 +637,12 @@ bool Scene::render(OSystem *system) {
 			}
 		}
 
+		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 @@ bool Scene::render(OSystem *system) {
 		}
 
 		//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 :(
 			}