[Gemrb-commits] gemrb: branch master updated. v0.7.1-97-gb9ed9e5

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  b9ed9e5aa1c515f6acc65f9b2a6aa7af73368026 (commit)

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

commit b9ed9e5aa1c515f6acc65f9b2a6aa7af73368026
Author: Brad Allred <bra...@me...>
Date:   Mon Aug 13 19:11:42 2012 -0600

    DialogHandler: apparently InCutSceneMode checks more than i thought.
    
    fix this to check only the cutscene flag.

diff --git a/gemrb/core/DialogHandler.cpp b/gemrb/core/DialogHandler.cpp
index 2ddb15f..232328e 100644
--- a/gemrb/core/DialogHandler.cpp
+++ b/gemrb/core/DialogHandler.cpp
@@ -177,10 +177,11 @@ void DialogHandler::EndDialog(bool try_to_break)
 	core->GetGUIScriptEngine()->RunFunction( "GUIWORLD", "DialogEnded" );
 	//restoring original size
 	core->GetGame()->SetControlStatus(CS_DIALOG, BM_NAND);
-	if ( !core->InCutSceneMode() ) {
-		core->GetGameControl()->SetScreenFlags(SF_DISABLEMOUSE|SF_LOCKSCROLL, BM_NAND);
+	GameControl* gc = core->GetGameControl();
+	if ( !(gc->GetScreenFlags()&SF_CUTSCENE)) {
+		gc->SetScreenFlags(SF_DISABLEMOUSE|SF_LOCKSCROLL, BM_NAND);
 	}
-	core->GetGameControl()->SetDialogueFlags(0, BM_SET);
+	gc->SetDialogueFlags(0, BM_SET);
 	core->SetEventFlag(EF_PORTRAIT);
 }
 

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


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