From: Jaka K. <lyn...@us...> - 2010-12-29 17:14:44
|
gemrb: Infinity Engine emulator The branch master has been updated via 47ead53eec1fe728d7635820c2fd49314daeea3b (commit) Summary of changes: gemrb/core/Scriptable/ActorBlock.cpp | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) from 56edb8ac79120dc21bbe8308069481d0bd09c4ad (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=47ead53eec1fe728d7635820c2fd49314daeea3b commit 47ead53eec1fe728d7635820c2fd49314daeea3b Author: Jaka Kranjc <lyn...@us...> Date: Wed Dec 29 18:16:23 2010 +0100 clear the specially forced surge after use (+a forgotten line from 18b076a6ce813c) diff --git a/gemrb/core/Scriptable/ActorBlock.cpp b/gemrb/core/Scriptable/ActorBlock.cpp index 76bda61..742aa0a 100644 --- a/gemrb/core/Scriptable/ActorBlock.cpp +++ b/gemrb/core/Scriptable/ActorBlock.cpp @@ -849,6 +849,8 @@ int Scriptable::CastSpell( const ieResRef SpellResRef, Scriptable* target, bool return SpellCast(SpellResRef, instant); } +static EffectRef fx_force_surge_modifier_ref={"ForceSurgeModifier",NULL,-1}; + //start spellcasting (common part) int Scriptable::SpellCast(const ieResRef SpellResRef, bool instant) { @@ -887,6 +889,12 @@ int Scriptable::SpellCast(const ieResRef SpellResRef, bool instant) } fxqueue->AddAllEffects(actor, actor->Pos); delete fxqueue; + actor->WMLevelMod = 0; + if (actor->Modified[IE_FORCESURGE] == 1) { + // affects only the next spell cast, but since the timing is permanent, + // we have to remove it manually + actor->fxqueue.RemoveAllEffectsWithParam(fx_force_surge_modifier_ref, 1); + } } gamedata->FreeSpell(spl, SpellResRef, false); ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |