[Gemrb-commits] gemrb: branch master updated. v0.6.6-4-g5963e59

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  5963e5903ac5c3775809b168ef7c3ba4d2683d47 (commit)

Summary of changes:
 gemrb/core/Scriptable/Actor.cpp |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)
      from  b14f5952d054ecacc22ed2f489189366b4d89181 (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=5963e5903ac5c3775809b168ef7c3ba4d2683d47

commit 5963e5903ac5c3775809b168ef7c3ba4d2683d47
Author: Avenger <ave...@so...>
Date:   Tue Oct 4 00:34:32 2011 +0200

    alternative sound tags for sounds.ini

diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
index f1026d6..1fc1206 100644
--- a/gemrb/core/Scriptable/Actor.cpp
+++ b/gemrb/core/Scriptable/Actor.cpp
@@ -204,6 +204,7 @@ ActionButtonRow DefaultButtons = {ACT_TALK, ACT_WEAPON1, ACT_WEAPON2,
 	ACT_QSLOT3, ACT_INNATE};
 static int QslotTranslation = false;
 static int DeathOnZeroStat = true;
+static int IWDSound = false;
 static ieDword TranslucentShadows = 0;
 static int ProjectileSize = 0; //the size of the projectile immunity bitfield (dwords)
 
@@ -1437,6 +1438,7 @@ static void InitActorTables()
 	ReverseToHit = core->HasFeature(GF_REVERSE_TOHIT);
 	CheckAbilities = core->HasFeature(GF_CHECK_ABILITIES);
 	DeathOnZeroStat = core->HasFeature(GF_DEATH_ON_ZERO_STAT);
+	IWDSound = core->HasFeature(GF_SOUNDS_INI);
 
 	//this table lists various level based xp bonuses
 	AutoTable tm("xpbonus");
@@ -6115,6 +6117,8 @@ void Actor::GetSoundFrom2DA(ieResRef Sound, unsigned int index) const
 	strnlwrcpy(Sound, tab->QueryField (index, col), 8);
 }
 
+//Get the monster sound from a global .ini file.
+//It is ResData.ini in PST and Sounds.ini in IWD/HoW
 void Actor::GetSoundFromINI(ieResRef Sound, unsigned int index) const
 {
 	const char *resource = "";
@@ -6127,15 +6131,19 @@ void Actor::GetSoundFromINI(ieResRef Sound, unsigned int index) const
 
 	switch(index) {
 		case VB_ATTACK:
-			resource = core->GetResDataINI()->GetKeyAsString(section, "at1sound","");
+			resource = core->GetResDataINI()->GetKeyAsString(section, IWDSound?"att1":"at1sound","");
 			break;
 		case VB_DAMAGE:
-			resource = core->GetResDataINI()->GetKeyAsString(section, "hitsound","");
+			resource = core->GetResDataINI()->GetKeyAsString(section, IWDSound?"damage":"hitsound","");
 			break;
 		case VB_DIE:
-			resource = core->GetResDataINI()->GetKeyAsString(section, "dfbsound","");
+			resource = core->GetResDataINI()->GetKeyAsString(section, IWDSound?"death":"dfbsound","");
 			break;
 		case VB_SELECT:
+			//this isn't in PST, apparently
+			if (IWDSound) {
+				resource = core->GetResDataINI()->GetKeyAsString(section, "selected","");
+			}
 			break;
 	}
 	int count = CountElements(resource,',');

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


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