[Gemrb-commits] gemrb: branch master updated. v0.6.2-1518-g812d499

[Jaka K. <lyn...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  812d4993f6a077864ee37e5dacba9e40100c310d (commit)

Summary of changes:
 gemrb/core/Scriptable/Scriptable.cpp |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
      from  c3aed07230bffafd9103fe2884420646a41e4c8f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=812d4993f6a077864ee37e5dacba9e40100c310d

commit 812d4993f6a077864ee37e5dacba9e40100c310d
Author: Jaka Kranjc <lyn...@us...>
Date:   Wed Aug 10 21:28:19 2011 +0200

    only actors have to wait for their auras

diff --git a/gemrb/core/Scriptable/Scriptable.cpp b/gemrb/core/Scriptable/Scriptable.cpp
index adcfb46..c8e1549 100644
--- a/gemrb/core/Scriptable/Scriptable.cpp
+++ b/gemrb/core/Scriptable/Scriptable.cpp
@@ -1351,6 +1351,10 @@ bool Scriptable::HandleHardcodedSurge(ieResRef surgeSpellRef, Spell *spl, Actor
 
 bool Scriptable::AuraPolluted()
 {
+	if (Type != ST_ACTOR) {
+		return false;
+	}
+
 	// aura pollution happens automatically
 	// aura cleansing the usual and magical way
 	if (AuraTicks >= core->Time.attack_round_size) {

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator