From: Jaka K. <lyn...@us...> - 2012-10-17 17:50:53
|
gemrb: Infinity Engine emulator The branch master has been updated via 0fffb78e8332a0252258ad4eca3339dde429d4ee (commit) Summary of changes: gemrb/core/GameScript/Matching.cpp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) from c6f5a2b7db3da013756fe3167dc338b54b643347 (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=0fffb78e8332a0252258ad4eca3339dde429d4ee commit 0fffb78e8332a0252258ad4eca3339dde429d4ee Author: Alyssa Milburn <fu...@fu...> Date: Wed Oct 17 17:31:35 2012 +0200 targetting fixes crashes were induced by fighting the underdark svivnerblin pit fiend diff --git a/gemrb/core/GameScript/Matching.cpp b/gemrb/core/GameScript/Matching.cpp index 37b8156..d5ea61b 100644 --- a/gemrb/core/GameScript/Matching.cpp +++ b/gemrb/core/GameScript/Matching.cpp @@ -294,7 +294,7 @@ Scriptable* GetStoredActorFromObject(Scriptable* Sender, Object* oC, int ga_flag // maybe store the target if it's an actor.. if (tar && tar->Type == ST_ACTOR) { // .. but we only want objects created via objectFilters - if (oC->objectFilters[0]) { + if (oC && oC->objectFilters[0]) { Sender->CurrentActionTarget = tar->GetGlobalID(); } } @@ -311,7 +311,7 @@ Scriptable* GetActorFromObject(Scriptable* Sender, Object* oC, int ga_flags) //now this could return other than actor objects aC = tgts->GetTarget(0,-1); delete tgts; - if (aC || oC->objectFields[0]!=-1) { + if (aC || !oC || oC->objectFields[0]!=-1) { return aC; } ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |