[Gemrb-commits] gemrb: branch master updated. v0.7.1-96-gea4b563

[Brad A. <br...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  ea4b5631d100f6a60b0d4300d93b1936bf8f95f0 (commit)
       via  318204986a14bce92190a0a9819753ca6266828d (commit)

Summary of changes:
 gemrb/core/DialogHandler.cpp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
      from  fd4384028530682eb5eb2c9adc00964d4bf4f6f7 (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=ea4b5631d100f6a60b0d4300d93b1936bf8f95f0

commit ea4b5631d100f6a60b0d4300d93b1936bf8f95f0
Merge: 3182049 fd43840
Author: Brad Allred <bra...@me...>
Date:   Mon Aug 13 18:46:57 2012 -0600

    Merge branch 'master' of ssh://gemrb.git.sourceforge.net/gitroot/gemrb/gemrb


http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=318204986a14bce92190a0a9819753ca6266828d

commit 318204986a14bce92190a0a9819753ca6266828d
Author: Brad Allred <bra...@me...>
Date:   Mon Aug 13 18:44:31 2012 -0600

    DialogHandler: only clear SF_DISABLEMOUSE and SF_LOCKSCROLL if cutscene mode is not active.

diff --git a/gemrb/core/DialogHandler.cpp b/gemrb/core/DialogHandler.cpp
index 0dd5889..2ddb15f 100644
--- a/gemrb/core/DialogHandler.cpp
+++ b/gemrb/core/DialogHandler.cpp
@@ -177,7 +177,9 @@ void DialogHandler::EndDialog(bool try_to_break)
 	core->GetGUIScriptEngine()->RunFunction( "GUIWORLD", "DialogEnded" );
 	//restoring original size
 	core->GetGame()->SetControlStatus(CS_DIALOG, BM_NAND);
-	core->GetGameControl()->SetScreenFlags(SF_DISABLEMOUSE|SF_LOCKSCROLL, BM_NAND);
+	if ( !core->InCutSceneMode() ) {
+		core->GetGameControl()->SetScreenFlags(SF_DISABLEMOUSE|SF_LOCKSCROLL, BM_NAND);
+	}
 	core->GetGameControl()->SetDialogueFlags(0, BM_SET);
 	core->SetEventFlag(EF_PORTRAIT);
 }

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


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