[Gemrb-commits] gemrb: branch master updated. v0.7.0-99-gf94ffbe

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  f94ffbeff74ff16f15a2e364d37528e2e4f4d923 (commit)

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

commit f94ffbeff74ff16f15a2e364d37528e2e4f4d923
Author: Avenger <ave...@so...>
Date:   Sun Jan 22 16:26:58 2012 +0100

    fixed a crash bug with iwd2

diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
index 03e0708..3db0ca8 100644
--- a/gemrb/core/Scriptable/Actor.cpp
+++ b/gemrb/core/Scriptable/Actor.cpp
@@ -7486,11 +7486,15 @@ void Actor::CreateDerivedStatsIWD2()
 //and similar derived stats that change with level
 void Actor::CreateDerivedStats()
 {
-	ieDword cls = BaseStats[IE_CLASS]-1;
-	if (cls>=(ieDword) classcount) {
+	if (core->HasFeature(GF_LEVELSLOT_PER_CLASS)) {
 		multiclass = 0;
 	} else {
-		multiclass = multi[cls];
+		ieDword cls = BaseStats[IE_CLASS]-1;
+		if (cls>=(ieDword) classcount) {
+			multiclass = 0;
+		} else {
+			multiclass = multi[cls];
+		}
 	}
 
 	if (core->HasFeature(GF_3ED_RULES)) {

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


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