From: Jaka K. <lyn...@us...> - 2012-05-16 20:42:34
|
gemrb: Infinity Engine emulator The branch master has been updated via 26c2ddcf88886a7d7ca32942728d7f3e408bdf92 (commit) via 5e84f588b2263690756853f0e912eaa1a771f236 (commit) Summary of changes: gemrb/core/Projectile.cpp | 2 ++ gemrb/plugins/FXOpcodes/FXOpcodes.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) from 8d7eccb37e39df09e1b9c1e1cf468f5edb727c12 (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=26c2ddcf88886a7d7ca32942728d7f3e408bdf92 commit 26c2ddcf88886a7d7ca32942728d7f3e408bdf92 Author: Jaka Kranjc <lyn...@us...> Date: Wed May 16 22:13:49 2012 +0200 fx_cast_spell_on_condition: show an error message if the range check fails diff --git a/gemrb/plugins/FXOpcodes/FXOpcodes.cpp b/gemrb/plugins/FXOpcodes/FXOpcodes.cpp index 8b446d3..b476d07 100644 --- a/gemrb/plugins/FXOpcodes/FXOpcodes.cpp +++ b/gemrb/plugins/FXOpcodes/FXOpcodes.cpp @@ -5885,7 +5885,7 @@ int fx_cast_spell_on_condition (Scriptable* Owner, Actor* target, Effect* fx) if (fx->Parameter2 == COND_GOTHIT) { dist = GetSpellDistance(refs[i], target); if (!dist) { - //TODO: display 36937 + displaymsg->DisplayConstantStringName(STR_CONTFAIL, DMC_RED, target); continue; } if (PersonalDistance(target, actor) > dist) { http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=5e84f588b2263690756853f0e912eaa1a771f236 commit 5e84f588b2263690756853f0e912eaa1a771f236 Author: Jaka Kranjc <lyn...@us...> Date: Wed May 16 19:29:20 2012 +0200 Projectile::GetTarget: added a debug print for when the target is 0 diff --git a/gemrb/core/Projectile.cpp b/gemrb/core/Projectile.cpp index 9746989..8decfcb 100644 --- a/gemrb/core/Projectile.cpp +++ b/gemrb/core/Projectile.cpp @@ -460,6 +460,8 @@ Actor *Projectile::GetTarget() } effects->SetOwner(original); return target; + } else { + Log(DEBUG, "Projectile", "GetTarget: Target not set or dummy, using caster!"); } target = area->GetActorByGlobalID(Caster); if (target) { ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |