[Gemrb-commits] gemrb: branch master updated. v0.6.2-921-g3d367da

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  3d367daab2a7648e955df1b0c231b3d2a991f7a8 (commit)

Summary of changes:
 gemrb/core/Scriptable/Actor.cpp |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
      from  b4d23fde20b9412c11dc12e860cf01f353916291 (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=3d367daab2a7648e955df1b0c231b3d2a991f7a8

commit 3d367daab2a7648e955df1b0c231b3d2a991f7a8
Author: Alyssa Milburn <fu...@fu...>
Date:   Mon Mar 14 22:47:59 2011 +0100

    Add another temporary hack to the combat code.

diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
index aae8da6..8a7602a 100644
--- a/gemrb/core/Scriptable/Actor.cpp
+++ b/gemrb/core/Scriptable/Actor.cpp
@@ -4552,7 +4552,11 @@ void Actor::PerformAttack(ieDword gameTime)
 	}
 
 	//only return if we don't have any attacks left this round
-	if (attackcount==0) return;
+	if (attackcount==0) {
+		// this is also part of the UpdateActorState hack below. sorry!
+		lastattack = gameTime;
+		return;
+	}
 
 	// this check shouldn't be necessary, but it causes a divide-by-zero below,
 	// so i would like it to be clear if it ever happens

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


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