[Gemrb-commits] gemrb: branch master updated. v0.6.6-2-g6504958

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  6504958ba0e7bfc561131db0df521355e9170b4b (commit)

Summary of changes:
 gemrb/core/Interface.cpp |    6 ++++--
 gemrb/includes/globals.h |    3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)
      from  826b19b943478b8c3472cac888dce6d0462a9dc3 (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=6504958ba0e7bfc561131db0df521355e9170b4b

commit 6504958ba0e7bfc561131db0df521355e9170b4b
Author: Avenger <ave...@so...>
Date:   Tue Oct 4 00:31:19 2011 +0200

    use Sounds.ini in case of iwd/how

diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp
index 7d63798..3cf6bd4 100644
--- a/gemrb/core/Interface.cpp
+++ b/gemrb/core/Interface.cpp
@@ -1748,10 +1748,11 @@ int Interface::Init()
 		printStatus( "NOT FOUND", YELLOW );
 	}
 
-	if (HasFeature( GF_RESDATA_INI )) {
+	int resdata = HasFeature( GF_RESDATA_INI );
+	if (resdata || HasFeature(GF_SOUNDS_INI) ) {
 		printMessage( "Core", "Loading resource data File...", WHITE );
 		INIresdata = PluginHolder<DataFileMgr>(IE_INI_CLASS_ID);
-		DataStream* ds = gamedata->GetResource("resdata", IE_INI_CLASS_ID);
+		DataStream* ds = gamedata->GetResource(resdata? "resdata":"sounds", IE_INI_CLASS_ID);
 		if (!INIresdata->Open(ds)) {
 			printStatus( "ERROR", LIGHT_RED );
 		} else {
@@ -2525,6 +2526,7 @@ static const char *game_flags[GF_COUNT+1]={
 		"ForceAreaScript",    //59GF_FORCE_AREA_SCRIPT
 		"AreaOverride",       //60GF_AREA_OVERRIDE
 		"NoNewVariables",     //61GF_NO_NEW_VARIABLES
+		"HasSoundsIni",       //62GF_SOUNDS_INI
 		NULL                  //for our own safety, this marks the end of the pole
 };
 
diff --git a/gemrb/includes/globals.h b/gemrb/includes/globals.h
index 5e8211e..20c4170 100644
--- a/gemrb/includes/globals.h
+++ b/gemrb/includes/globals.h
@@ -144,8 +144,9 @@
 #define  GF_FORCE_AREA_SCRIPT           59 //how and iwd2 (maybe iwd1)
 #define  GF_AREA_OVERRIDE               60 //pst maze and other hardcode
 #define  GF_NO_NEW_VARIABLES            61 //pst
+#define  GF_SOUNDS_INI                  62 //iwd/how/iwd2
 //update this or bad things can happen
-#define GF_COUNT 62
+#define GF_COUNT 63
 
 //the number of item usage fields (used in CREItem and STOItem)
 #define CHARGE_COUNTERS  3

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


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