[Gemrb-commits] gemrb: branch master updated. v0.6.6-156-g96c1179

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  96c1179cdb8cb6b206d1608152e47f30f2acc72e (commit)
       via  e485da5d9f5f7f812bc719e8a6be3124968127a5 (commit)

Summary of changes:
 gemrb/core/Scriptable/Scriptable.cpp |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
      from  b2db66155888f757e10e46c5540eb079baf12abc (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=96c1179cdb8cb6b206d1608152e47f30f2acc72e

commit 96c1179cdb8cb6b206d1608152e47f30f2acc72e
Author: Jaka Kranjc <lyn...@us...>
Date:   Sat Nov 26 23:09:00 2011 +0100

    don't add the casting animation for forced instant casts
    fixes jarred spellhold thieves appearing to cast finger of death on
     themselves, rather than it being obvious all the action is from Jon

diff --git a/gemrb/core/Scriptable/Scriptable.cpp b/gemrb/core/Scriptable/Scriptable.cpp
index 8101923..e1c345d 100644
--- a/gemrb/core/Scriptable/Scriptable.cpp
+++ b/gemrb/core/Scriptable/Scriptable.cpp
@@ -1148,7 +1148,7 @@ int Scriptable::SpellCast(bool instant)
 		//cfb
 		EffectQueue *fxqueue = spl->GetEffectBlock(this, this->Pos, -1, level);
 		fxqueue->SetOwner(actor);
-		if (!actor->Modified[IE_AVATARREMOVAL]) {
+		if (!(actor->Modified[IE_AVATARREMOVAL] || instant)) {
 			spl->AddCastingGlow(fxqueue, duration, actor->Modified[IE_SEX]);
 		}
 		fxqueue->AddAllEffects(actor, actor->Pos);

http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=e485da5d9f5f7f812bc719e8a6be3124968127a5

commit e485da5d9f5f7f812bc719e8a6be3124968127a5
Author: Jaka Kranjc <lyn...@us...>
Date:   Sat Nov 26 23:07:11 2011 +0100

    added workaround for the coordinator->irenicus spellhold transition crash
    (triggered by cut41g forcing a NOHOLD_PARTY cast)

diff --git a/gemrb/core/Scriptable/Scriptable.cpp b/gemrb/core/Scriptable/Scriptable.cpp
index bdd3239..8101923 100644
--- a/gemrb/core/Scriptable/Scriptable.cpp
+++ b/gemrb/core/Scriptable/Scriptable.cpp
@@ -437,7 +437,8 @@ void Scriptable::AddAction(Action* aC)
 
 	// attempt to handle 'instant' actions, from instant.ids, which run immediately
 	// when added if the action queue is empty, even on actors which are Held/etc
-	if (!CurrentAction && !GetNextAction()) {
+	// FIXME: area check hack until fuzzie fixes scripts here
+	if (!CurrentAction && !GetNextAction() && area) {
 		if (actionflags[aC->actionID] & AF_INSTANT) {
 			CurrentAction = aC;
 			GameScript::ExecuteAction( this, CurrentAction );

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


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