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

[megath at users.sourceforge.net]

Revision: 48342
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48342&view=rev
Author:   megath
Date:     2010-03-20 23:04:18 +0000 (Sat, 20 Mar 2010)

Log Message:
-----------
reverted inventory objects patch, added mark's animation z-order patch.

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

Modified: scummvm/trunk/engines/teenagent/inventory.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/inventory.cpp	2010-03-20 22:03:28 UTC (rev 48341)
+++ scummvm/trunk/engines/teenagent/inventory.cpp	2010-03-20 23:04:18 UTC (rev 48342)
@@ -62,7 +62,7 @@
 	offset[92] = items_size; 
 
 	Resources *res = Resources::instance();
-	for (byte i = 0; i < 92; ++i) {
+	for (byte i = 0; i <= 92; ++i) {
 		InventoryObject io;
 		uint16 obj_addr = res->dseg.get_word(0xc4a4 + i * 2);
 		if (obj_addr != 0)

Modified: scummvm/trunk/engines/teenagent/scene.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/scene.cpp	2010-03-20 22:03:28 UTC (rev 48341)
+++ scummvm/trunk/engines/teenagent/scene.cpp	2010-03-20 23:04:18 UTC (rev 48342)
@@ -731,6 +731,10 @@
 			s->render(surface);
 		}
 
+		if (mark != NULL && debug_features.feature[DebugFeatures::kShowOn]) {
+			on.render(surface, actor_animation_position);
+		}
+
 		if (mark != NULL) {
 			actor_animation_position = mark->render(surface);
 			if (!actor_animation.ignore)
@@ -809,7 +813,7 @@
 		}
 		//removed mark == null. In final scene of chapter 2 mark rendered above table. 
 		//if it'd cause any bugs, add hack here. (_id != 23 && mark == NULL) 
-		if (debug_features.feature[DebugFeatures::kShowOn]) {
+		if (mark == NULL && debug_features.feature[DebugFeatures::kShowOn]) {
 			on.render(surface, actor_animation_position);
 		}
 


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