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

[megath at users.sourceforge.net]

Revision: 45969
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45969&view=rev
Author:   megath
Date:     2009-11-18 08:15:16 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
use actual actor position for overlay positioning to avoid z-order glitches.

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

Modified: scummvm/trunk/engines/teenagent/callbacks.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/callbacks.cpp	2009-11-18 08:13:44 UTC (rev 45968)
+++ scummvm/trunk/engines/teenagent/callbacks.cpp	2009-11-18 08:15:16 UTC (rev 45969)
@@ -356,6 +356,9 @@
 			playAnimation(820, 1);
 			setOns(3, 0x59);
 			//some moving animation is missing here
+			moveTo(scene->getPosition().x, scene->getPosition().y + 1, 3);
+			//wait
+			moveTo(scene->getPosition().x, scene->getPosition().y - 1, 2);
 			displayMessage(0x551f);
 			enableObject(4);
 			SET_FLAG(0xdbdc, 1);

Modified: scummvm/trunk/engines/teenagent/scene.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/scene.cpp	2009-11-18 08:13:44 UTC (rev 45968)
+++ scummvm/trunk/engines/teenagent/scene.cpp	2009-11-18 08:15:16 UTC (rev 45969)
@@ -651,7 +651,7 @@
 
 		if (debug_features.feature[DebugFeatures::kShowOn]) {
 			if (_id != 16 || getOns(16)[0] != 0) {
-				on.render(surface, actor_animation_position.bottom, false); //do not render boat on isle. I double checked all callbacks, there's no code switching off the boat :(
+				on.render(surface, position.y, false); //do not render boat on isle. I double checked all callbacks, there's no code switching off the boat :(
 			}
 		}
 
@@ -720,7 +720,7 @@
 		//render on
 		if (debug_features.feature[DebugFeatures::kShowOn]) {
 			if (_id != 16 || getOns(16)[0] != 0) {
-				on.render(surface, actor_animation_position.bottom, true); //do not render boat on isle. I double checked all callbacks, there's no code switching off the boat :(
+				on.render(surface, position.y, true); //do not render boat on isle. I double checked all callbacks, there's no code switching off the boat :(
 			}
 		}
 

Modified: scummvm/trunk/engines/teenagent/surface.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/surface.cpp	2009-11-18 08:13:44 UTC (rev 45968)
+++ scummvm/trunk/engines/teenagent/surface.cpp	2009-11-18 08:15:16 UTC (rev 45969)
@@ -51,7 +51,7 @@
 	if (stream->eos() || w_ == 0)
 		return;
 
-	if (w_ * h_ > stream->size()) {//rough but working
+	if (w_ * h_ > stream->size()) {
 		debug(0, "invalid surface %ux%u -> %u,%u", w_, h_, x, y);
 		return;
 	}

Modified: scummvm/trunk/engines/teenagent/surface_list.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/surface_list.cpp	2009-11-18 08:13:44 UTC (rev 45968)
+++ scummvm/trunk/engines/teenagent/surface_list.cpp	2009-11-18 08:15:16 UTC (rev 45969)
@@ -67,7 +67,7 @@
 	for(uint i = 0; i < surfaces_n; ++i) {
 		const Surface &s = surfaces[i];
 		if (second_pass) {
-			debug(0, "%d %d", s.y + s.h, horizon);
+			//debug(0, "%d %d", s.y + s.h, horizon);
 			if (s.y + s.h > horizon)
 				dirty.extend(s.render(surface));
 		} else {

Modified: scummvm/trunk/engines/teenagent/surface_list.h
===================================================================
--- scummvm/trunk/engines/teenagent/surface_list.h	2009-11-18 08:13:44 UTC (rev 45968)
+++ scummvm/trunk/engines/teenagent/surface_list.h	2009-11-18 08:15:16 UTC (rev 45969)
@@ -37,7 +37,7 @@
 	SurfaceList();
 	void load(Common::SeekableReadStream *stream, Type type, int sub_hack = 0);
 	void free();
-	Common::Rect render(Graphics::Surface *surface, int horizont, bool second_pass) const;
+	Common::Rect render(Graphics::Surface *surface, int horizon, bool second_pass) const;
 	
 protected:
 	Surface * surfaces;


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