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

[<ze...@us...>]

Revision: 6223
          http://gemrb.svn.sourceforge.net/gemrb/?rev=6223&view=rev
Author:   zefklop
Date:     2009-05-31 22:06:02 +0000 (Sun, 31 May 2009)

Log Message:
-----------
Fix timers relates triggers. Thanks to fuzzie for spotting.

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

Modified: gemrb/trunk/gemrb/plugins/Core/Triggers.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Triggers.cpp	2009-05-31 21:52:36 UTC (rev 6222)
+++ gemrb/trunk/gemrb/plugins/Core/Triggers.cpp	2009-05-31 22:06:02 UTC (rev 6223)
@@ -744,7 +744,7 @@
 
 	ieDword value1 = CheckVariable(Sender, parameters->string0Parameter, parameters->string1Parameter, &valid );
 	if (valid) {
-		if ( value1 == core->GetGame()->GameTime/ROUND_SIZE ) return 1;
+		if ( value1 == core->GetGame()->GameTime ) return 1;
 	}
 	return 0;
 }
@@ -755,7 +755,7 @@
 
 	ieDword value1 = CheckVariable(Sender, parameters->string0Parameter, parameters->string1Parameter, &valid );
 	if (valid && value1) {
-		if ( value1 < core->GetGame()->GameTime/ROUND_SIZE ) return 1;
+		if ( value1 < core->GetGame()->GameTime ) return 1;
 	}
 	return 0;
 }
@@ -767,7 +767,7 @@
 
 	ieDword value1 = CheckVariable(Sender, parameters->string0Parameter, parameters->string1Parameter, &valid );
 	if (valid && value1) {
-	 	if ( value1 > core->GetGame()->GameTime/ROUND_SIZE ) return 1;
+	 	if ( value1 > core->GetGame()->GameTime ) return 1;
 	}
 	return 0;
 }
@@ -780,7 +780,7 @@
 
 	ieDword value1 = CheckVariable(Sender, parameters->string0Parameter, parameters->string1Parameter, &valid );
 	if (valid && value1) {
-		if ( value1 > core->GetGame()->GameTime/ROUND_SIZE ) return 1;
+		if ( value1 > core->GetGame()->GameTime ) return 1;
 	}
 	return 0;
 }


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