[Gemrb-commits] gemrb: branch master updated. cac3740d12c2d9ff70e049a21c17fc774bb60254

[Tom <rtp...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  cac3740d12c2d9ff70e049a21c17fc774bb60254 (commit)

Summary of changes:
 gemrb/core/GSUtils.cpp    |    5 ++++-
 gemrb/core/GSUtils.h      |    1 -
 gemrb/core/GameScript.cpp |    9 ---------
 3 files changed, 4 insertions(+), 11 deletions(-)
      from  13124f45fa98ff89821f41bf68d5b34e487aac60 (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=cac3740d12c2d9ff70e049a21c17fc774bb60254

commit cac3740d12c2d9ff70e049a21c17fc774bb60254
Author: Tom Prince <tom...@ua...>
Date:   Fri May 21 23:10:18 2010 -0400

    Make GUI 'Character Subtitles' option work.
    
    Signed-off-by: Tom Prince <tom...@ua...>

diff --git a/gemrb/core/GSUtils.cpp b/gemrb/core/GSUtils.cpp
index ee84720..9988150 100644
--- a/gemrb/core/GSUtils.cpp
+++ b/gemrb/core/GSUtils.cpp
@@ -36,7 +36,6 @@
 #include "defsounds.h"
 
 int initialized = 0;
-bool charactersubtitles = true;
 //these tables will get freed by Core
 SymbolMgr* triggersTable;
 SymbolMgr* actionsTable;
@@ -389,6 +388,10 @@ void DisplayStringCore(Scriptable* Sender, int Strref, int flags)
 			actor->ResolveStringConstant( sb.Sound, (unsigned int) Strref);
 		}
 		Strref = tmp;
+
+		//display the verbal constants in the console
+		ieDword charactersubtitles = 0;
+		core->GetDictionary()->Lookup("Subtitles", charactersubtitles);
 		if (charactersubtitles) {
 			flags |= DS_CONSOLE;
 		}
diff --git a/gemrb/core/GSUtils.h b/gemrb/core/GSUtils.h
index c40e4bc..1a66170 100644
--- a/gemrb/core/GSUtils.h
+++ b/gemrb/core/GSUtils.h
@@ -32,7 +32,6 @@
 #define ID_TRIGGERS  16
 
 extern int initialized;
-extern bool charactersubtitles;
 extern SymbolMgr* triggersTable;
 extern SymbolMgr* actionsTable;
 extern SymbolMgr* objectsTable;
diff --git a/gemrb/core/GameScript.cpp b/gemrb/core/GameScript.cpp
index 7f222a5..b48b239 100644
--- a/gemrb/core/GameScript.cpp
+++ b/gemrb/core/GameScript.cpp
@@ -1239,15 +1239,6 @@ GameScript::GameScript(const ieResRef ResRef, ScriptableType ScriptType,
 
 	if (!initialized) {
 		initialized = 1;
-		ieDword tmp = 0;
-
-		//display the verbal constants in the console
-		core->GetDictionary()->Lookup("Subtitles", tmp);
-		if (tmp) {
-			charactersubtitles = true;
-		} else {
-			charactersubtitles = false;
-		}
 
 		if (core->HasFeature(GF_CHARNAMEISGABBER)) {
 			charnameisgabber=true;

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


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