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

svn-id: r48342

2 files changed, 6 insertions, 2 deletions

diff --git a/engines/teenagent/inventory.cpp b/engines/teenagent/inventory.cpp
index b0fe6a009a..193c413367 100644
--- a/engines/teenagent/inventory.cpp
+++ b/engines/teenagent/inventory.cpp
@@ -62,7 +62,7 @@ void Inventory::init(TeenAgentEngine *engine) {
 	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)
diff --git a/engines/teenagent/scene.cpp b/engines/teenagent/scene.cpp
index b406bcc00a..2e2571bd96 100644
--- a/engines/teenagent/scene.cpp
+++ b/engines/teenagent/scene.cpp
@@ -731,6 +731,10 @@ bool Scene::render(bool tick_game, bool tick_mark, uint32 delta) {
 			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 @@ bool Scene::render(bool tick_game, bool tick_mark, uint32 delta) {
 		}
 		//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);
 		}