[Gemrb-commits] gemrb: branch master updated. v0.6.2-846-gc6c7c0a

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  c6c7c0af85c0d1e2423577aba5e3654922bd56a8 (commit)

Summary of changes:
 gemrb/plugins/FXOpcodes/FXOpcodes.cpp |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
      from  dc1f38ba8e6f8991aa0299f26801107731acb8f8 (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=c6c7c0af85c0d1e2423577aba5e3654922bd56a8

commit c6c7c0af85c0d1e2423577aba5e3654922bd56a8
Author: Jaka Kranjc <lyn...@us...>
Date:   Fri Mar 4 16:12:23 2011 +0100

    avoid (iwd) crash in fx_pause_target when target is null

diff --git a/gemrb/plugins/FXOpcodes/FXOpcodes.cpp b/gemrb/plugins/FXOpcodes/FXOpcodes.cpp
index c081f8b..34cf62e 100644
--- a/gemrb/plugins/FXOpcodes/FXOpcodes.cpp
+++ b/gemrb/plugins/FXOpcodes/FXOpcodes.cpp
@@ -4276,8 +4276,11 @@ int fx_cure_intoxication (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 int fx_pause_target (Scriptable* /*Owner*/, Actor * target, Effect* fx)
 {
 	if (0) printf( "fx_pause_target (%2d): Mod: %d, Type: %d\n", fx->Opcode, fx->Parameter1, fx->Parameter2 );
-
-	STAT_MOD( IE_CASTERHOLD );
+	if (target) {
+		STAT_MOD( IE_CASTERHOLD );
+	} else {
+		printf("fx_pause_target called with no target!\n");
+	}
 	return FX_PERMANENT;
 }
 

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


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