[Gemrb-commits] gemrb: branch master updated. v0.6.2-111-ga5e3eb2

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  a5e3eb2df315fee119fdfc5b626e9f44e6d19bba (commit)

Summary of changes:
 gemrb/core/Scriptable/Actor.cpp |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)
      from  ce47f11e3fc17895881da9d33690f595d5cafc20 (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=a5e3eb2df315fee119fdfc5b626e9f44e6d19bba

commit a5e3eb2df315fee119fdfc5b626e9f44e6d19bba
Author: Avenger <ave...@so...>
Date:   Wed Sep 8 19:32:56 2010 +0200

    improved/fixed 2da sound resolution

diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
index 6fba9d2..6108c7c 100644
--- a/gemrb/core/Scriptable/Actor.cpp
+++ b/gemrb/core/Scriptable/Actor.cpp
@@ -2504,7 +2504,7 @@ void Actor::ReactToDeath(const char * deadname)
 //call this only from gui selects
 void Actor::SelectActor()
 {
-	DisplayStringCore(this, VB_SELECT, DS_CONSOLE|DS_CONST );
+	DisplayStringCore(this, VB_SELECT+core->Roll(1,3,-1), DS_CONSOLE|DS_CONST );
 }
 
 void Actor::Panic(Scriptable *attacker, int panicmode)
@@ -5315,11 +5315,21 @@ void Actor::GetSoundFrom2DA(ieResRef Sound, unsigned int index)
 		case VB_DIE:
 			index = 10;
 			break;
+		//TODO: one day we should implement verbal constant groups
 		case VB_SELECT:
-			index = 36+rand()%4;
+		case VB_SELECT+1:
+		case VB_SELECT+2:
+			index = 36;
 			break;
+		default:
+			printMessage("Actor","TODO:", YELLOW);
+			printf("Cannot determine 2DA rowcount for index: %d\n", index);
+			return;
 	}
-	strnlwrcpy(Sound, tab->QueryField (index, 0), 8);
+	printMessage("Actor"," ", WHITE);
+	printf("Getting sound 2da %.8s entry: %s\n", anims->ResRef, tab->GetRowName(index) );
+	int col = core->Roll(1,tab->GetColumnCount(index),-1);
+	strnlwrcpy(Sound, tab->QueryField (index, col), 8);
 }
 
 void Actor::GetSoundFromINI(ieResRef Sound, unsigned int index)
@@ -5377,6 +5387,10 @@ void Actor::ResolveStringConstant(ieResRef Sound, unsigned int index)
 	} else {
 		GetSoundFrom2DA(Sound, index);
 	}
+
+	//Empty resrefs
+	if (Sound[0]=='*') Sound[0]=0;
+	else if(!strncmp(Sound,"nosound",8) ) Sound[0]=0;
 }
 
 void Actor::SetActionButtonRow(ActionButtonRow &ar)

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


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