[Gemrb-commits] gemrb: branch master updated. v0.6.2-831-gde8b71e

[Laszlo T. <ave...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  de8b71e090d191bba1a035299d251df9a869ac3b (commit)

Summary of changes:
 gemrb/core/GameScript/Actions.cpp |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
      from  967d6da111362a1a3f4685067ff66813301101e2 (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=de8b71e090d191bba1a035299d251df9a869ac3b

commit de8b71e090d191bba1a035299d251df9a869ac3b
Author: Avenger <ave...@so...>
Date:   Sun Feb 27 20:05:08 2011 +0100

    cannot use containers in dialog/cutscene

diff --git a/gemrb/core/GameScript/Actions.cpp b/gemrb/core/GameScript/Actions.cpp
index 2cfba19..f4828c0 100644
--- a/gemrb/core/GameScript/Actions.cpp
+++ b/gemrb/core/GameScript/Actions.cpp
@@ -5569,6 +5569,13 @@ void GameScript::UseContainer(Scriptable* Sender, Action* /*parameters*/)
 		Sender->ReleaseCurrentAction();
 		return;
 	}
+
+	if (core->InCutSceneMode()) {
+		//cannot use container in dialog or cutscene
+		Sender->ReleaseCurrentAction();
+		return;
+	}
+
 	Actor *actor = (Actor *)Sender;
 	Container *container = core->GetCurrentContainer();
 	if (!container) {

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


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