[Gemrb-commits] gemrb: branch master updated. v0.6.2-241-g185572f

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  185572fe4c626a6f63e068cab67c4361c19faacd (commit)

Summary of changes:
 gemrb/core/Scriptable/ActorBlock.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
      from  3649f5d6f3d263845147887eee98c8f893b269a6 (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=185572fe4c626a6f63e068cab67c4361c19faacd

commit 185572fe4c626a6f63e068cab67c4361c19faacd
Author: Jaka Kranjc <lyn...@us...>
Date:   Tue Oct 12 11:19:22 2010 +0200

    fixed the last commit to set and check the target more often, thanks fuzzie

diff --git a/gemrb/core/Scriptable/ActorBlock.cpp b/gemrb/core/Scriptable/ActorBlock.cpp
index bf3613f..f57cdd1 100644
--- a/gemrb/core/Scriptable/ActorBlock.cpp
+++ b/gemrb/core/Scriptable/ActorBlock.cpp
@@ -704,9 +704,11 @@ void Scriptable::CastSpellEnd( const ieResRef SpellResRef )
 		char tmp[100];
 		const char* msg = core->GetString(displaymsg->GetStringReference(STR_ACTION_CAST), 0);
 		const char* spell = core->GetString(spl->SpellName);
+		if (LastTarget) {
+			target = area->GetActorByGlobalID(LastTarget);
+		}
 		if (stricmp(spell, "")) {
-			if (LastTarget) {
-				target = area->GetActorByGlobalID(LastTarget);
+			if (target) {
 				snprintf(tmp, sizeof(tmp), "%s %s : %s", msg, spell, target->GetName(-1));
 			} else {
 				snprintf(tmp, sizeof(tmp), "%s : %s", spell, GetName(-1));

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


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