[Gemrb-commits] SF.net SVN: gemrb:[7072] gemrb/trunk/gemrb/plugins/Core/Map.cpp

[<fu...@us...>]

Revision: 7072
          http://gemrb.svn.sourceforge.net/gemrb/?rev=7072&view=rev
Author:   fuzzie
Date:     2009-08-28 21:45:34 +0000 (Fri, 28 Aug 2009)

Log Message:
-----------
InfoPoints of all types don't run scripts if TRAP_DEACTIVATED is set

Modified Paths:
--------------
    gemrb/trunk/gemrb/plugins/Core/Map.cpp

Modified: gemrb/trunk/gemrb/plugins/Core/Map.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Map.cpp	2009-08-28 21:26:28 UTC (rev 7071)
+++ gemrb/trunk/gemrb/plugins/Core/Map.cpp	2009-08-28 21:45:34 UTC (rev 7072)
@@ -744,7 +744,8 @@
 			break;
 		//If this InfoPoint has no script and it is not a Travel Trigger, skip it
 		bool wasActive = (ip->Scripts[0] || ( ip->Type == ST_TRAVEL ));
- 		// bool wasActive = !(ip->Flags&TRAP_DEACTIVATED);
+ 		if (wasActive)
+			wasActive = !(ip->Flags&TRAP_DEACTIVATED);
 
 		//If this InfoPoint is a Switch Trigger
 		if (ip->Type == ST_TRIGGER) {


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