gemrb: Infinity Engine emulator
The branch master has been updated
via b412c0a5babe1d6bf0292b7bc200f731e74cd23a (commit)
Summary of changes:
gemrb/core/GameScript/Actions.cpp | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
from f48402c03519bc2b664680c512c1beb24275f779 (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=b412c0a5babe1d6bf0292b7bc200f731e74cd23a
commit b412c0a5babe1d6bf0292b7bc200f731e74cd23a
Author: Avenger <avenger_teambg@...>
Date: Tue Jul 19 21:02:07 2011 +0200
fixed possible assertions in attack actions
diff --git a/gemrb/core/GameScript/Actions.cpp b/gemrb/core/GameScript/Actions.cpp
index 5c57000..f3a007b 100644
--- a/gemrb/core/GameScript/Actions.cpp
+++ b/gemrb/core/GameScript/Actions.cpp
@@ -5076,9 +5076,7 @@ void GameScript::AttackOneRound( Scriptable* Sender, Action* parameters)
AttackCore(Sender, tar, 0);
- if (Sender->CurrentActionState == 1) {
- //this is the LastDisarmFailed field, but this is an actor
- //Sender->LastTarget = 0;
+ if (Sender->CurrentActionState <= 1) {
Sender->ReleaseCurrentAction();
} else {
Sender->CurrentActionState--;
@@ -5246,7 +5244,11 @@ void GameScript::AttackReevaluate( Scriptable* Sender, Action* parameters)
AttackCore(Sender, tar, 0);
- Sender->CurrentActionState--;
+ if (Sender->CurrentActionState) {
+ Sender->CurrentActionState--;
+ } else {
+ Sender->ReleaseCurrentAction();
+ }
}
void GameScript::Explore( Scriptable* Sender, Action* /*parameters*/)
-----------------------------------------------------------------------
This is an automated email from the git hooks/post-receive script.
--
gemrb: Infinity Engine emulator
|