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

megath at users.sourceforge.net megath at users.sourceforge.net
Sun Mar 21 08:13:14 CET 2010


Revision: 48348
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48348&view=rev
Author:   megath
Date:     2010-03-21 07:13:13 +0000 (Sun, 21 Mar 2010)

Log Message:
-----------
reverted the z-order patch. 

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

Modified: scummvm/trunk/engines/teenagent/scene.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/scene.cpp	2010-03-21 00:50:34 UTC (rev 48347)
+++ scummvm/trunk/engines/teenagent/scene.cpp	2010-03-21 07:13:13 UTC (rev 48348)
@@ -731,10 +731,6 @@
 			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)
@@ -813,7 +809,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 (mark == NULL && debug_features.feature[DebugFeatures::kShowOn]) {
+		if (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.




More information about the Scummvm-git-logs mailing list