From: <fu...@us...> - 2009-06-19 19:32:20
|
Revision: 6527 http://gemrb.svn.sourceforge.net/gemrb/?rev=6527&view=rev Author: fuzzie Date: 2009-06-19 19:32:18 +0000 (Fri, 19 Jun 2009) Log Message: ----------- PerformAttack shouldn't run if !roundTime, and set roundTime to zero (bad hack) if target died Modified Paths: -------------- gemrb/trunk/gemrb/plugins/Core/Actor.cpp Modified: gemrb/trunk/gemrb/plugins/Core/Actor.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Actor.cpp 2009-06-19 17:07:56 UTC (rev 6526) +++ gemrb/trunk/gemrb/plugins/Core/Actor.cpp 2009-06-19 19:32:18 UTC (rev 6527) @@ -3496,6 +3496,9 @@ } } + // don't attack if there's no round started + if (!roundTime) return; + //only return if we don't have any attacks left this round if (attackcount==0) return; @@ -3531,7 +3534,9 @@ } if (!target) { + StopAttack(); LastTarget = 0; + roundTime = 0; return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |