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

[megath at users.sourceforge.net]

Revision: 45770
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45770&view=rev
Author:   megath
Date:     2009-11-08 23:56:06 +0000 (Sun, 08 Nov 2009)

Log Message:
-----------
fixed boat bug

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

Modified: scummvm/trunk/engines/teenagent/callbacks.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/callbacks.cpp	2009-11-08 23:32:01 UTC (rev 45769)
+++ scummvm/trunk/engines/teenagent/callbacks.cpp	2009-11-08 23:56:06 UTC (rev 45770)
@@ -1326,9 +1326,7 @@
 		inventory->add(10);
 		disableObject(2);
 		setOns(1, 10);
-
-		byte * scene_15_ons = scene->getOns(15); //patch ons for the scene 15
-		scene_15_ons[1] = 0;
+		setOns(1, 0, 15);
 		byte f = GET_FLAG(0xDB98) + 1;
 		SET_FLAG(0xDB98, f);
 		if (f >= 2) {
@@ -2373,11 +2371,11 @@
 		playSound(20, 9);
 		playActorAnimation(530);
 		loadScene(16, 236, 95, 1);
-		setOns(0, 9);
 		playActorAnimation(531);
 		playSound(36, 4);
 		playActorAnimation(532);
 		playActorAnimation(533);
+		setOns(0, 9);
 		moveTo(236, 95, 1, true);
 		playMusic(9);
 		return true;

Modified: scummvm/trunk/engines/teenagent/scene.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/scene.cpp	2009-11-08 23:32:01 UTC (rev 45769)
+++ scummvm/trunk/engines/teenagent/scene.cpp	2009-11-08 23:56:06 UTC (rev 45770)
@@ -383,6 +383,13 @@
 
 		Graphics::Surface *surface = system->lockScreen();
 
+		//render on
+		if (on.pixels != NULL) {
+			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 :(
+			}
+		}
+
 		if (ons != NULL) {
 			for (uint32 i = 0; i < ons_count; ++i) {
 				Surface *s = ons + i;
@@ -488,10 +495,6 @@
 			}
 		}
 
-		//render on
-		if (on.pixels != NULL) {
-			on.render(surface);
-		}
 
 		if (!message.empty()) {
 			bool visible = true;


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