From: Jaka K. <lyn...@us...> - 2010-08-02 17:36:02
|
gemrb: Infinity Engine emulator The branch master has been updated via 1e23ce151b20268f030039508b0890ba12c3cae0 (commit) Summary of changes: gemrb/plugins/FXOpcodes/FXOpcodes.cpp | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) from f56ff7acf8949878ab14996f18d853650bb127f0 (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=1e23ce151b20268f030039508b0890ba12c3cae0 commit 1e23ce151b20268f030039508b0890ba12c3cae0 Author: Jaka Kranjc <lyn...@us...> Date: Mon Aug 2 19:42:21 2010 +0200 fixed charming to be persistent diff --git a/gemrb/plugins/FXOpcodes/FXOpcodes.cpp b/gemrb/plugins/FXOpcodes/FXOpcodes.cpp index 9b462da..82cf718 100644 --- a/gemrb/plugins/FXOpcodes/FXOpcodes.cpp +++ b/gemrb/plugins/FXOpcodes/FXOpcodes.cpp @@ -1021,9 +1021,11 @@ int fx_set_charmed_state (Scriptable* Owner, Actor* target, Effect* fx) if (fx->Parameter1 && (STAT_GET(IE_GENERAL)!=fx->Parameter1)) { return FX_NOT_APPLIED; } + + Scriptable *caster = GetCaster(Owner, fx); bool enemyally = true; - if (Owner->Type==ST_ACTOR) { - enemyally = ((Actor *) Owner)->GetStat(IE_EA)>EA_GOODCUTOFF; //or evilcutoff? + if (caster->Type==ST_ACTOR) { + enemyally = ((Actor *) caster)->GetStat(IE_EA)>EA_GOODCUTOFF; //or evilcutoff? } switch (fx->Parameter2) { ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |