[Gemrb-commits] gemrb: branch master updated. v0.7.1-63-g5c80b7e

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  5c80b7e4e5ce64ca690ae0a0c34833e273e11d6b (commit)

Summary of changes:
 gemrb/core/GameScript/Triggers.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
      from  ce971b16c626d4c1994d236d253021a3ffa35044 (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=5c80b7e4e5ce64ca690ae0a0c34833e273e11d6b

commit 5c80b7e4e5ce64ca690ae0a0c34833e273e11d6b
Author: Jaka Kranjc <lyn...@us...>
Date:   Fri Aug 10 19:10:24 2012 +0200

    AreaCheck: avoid an odd ios crash

diff --git a/gemrb/core/GameScript/Triggers.cpp b/gemrb/core/GameScript/Triggers.cpp
index fd31540..5822468 100644
--- a/gemrb/core/GameScript/Triggers.cpp
+++ b/gemrb/core/GameScript/Triggers.cpp
@@ -2685,7 +2685,10 @@ int GameScript::UnselectableVariableLT(Scriptable* Sender, Trigger* parameters)
 
 int GameScript::AreaCheck(Scriptable* Sender, Trigger* parameters)
 {
-	if (!strnicmp(Sender->GetCurrentArea()->GetScriptName(), parameters->string0Parameter, 8)) {
+	Map *area = Sender->GetCurrentArea();
+	if (!area) return 0;
+
+	if (!strnicmp(area->GetScriptName(), parameters->string0Parameter, 8)) {
 		return 1;
 	}
 	return 0;

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


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