[Gemrb-commits] gemrb: branch master updated. v0.6.2-90-gdf4c12e

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  df4c12eff9df031b7dc5a94511b6c13c7c6cf328 (commit)

Summary of changes:
 gemrb/core/CharAnimations.cpp   |    9 ++++-----
 gemrb/override/bg2/bloodclr.2da |    2 ++
 2 files changed, 6 insertions(+), 5 deletions(-)
      from  d775ea508f299db938db6cd233808b883f09850d (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=df4c12eff9df031b7dc5a94511b6c13c7c6cf328

commit df4c12eff9df031b7dc5a94511b6c13c7c6cf328
Author: Avenger <ave...@so...>
Date:   Thu Sep 2 22:15:19 2010 +0200

    fixed previous commit

diff --git a/gemrb/core/CharAnimations.cpp b/gemrb/core/CharAnimations.cpp
index 84a0bdf..05ba3ae 100644
--- a/gemrb/core/CharAnimations.cpp
+++ b/gemrb/core/CharAnimations.cpp
@@ -465,18 +465,17 @@ void CharAnimations::InitAvatarsTable()
 			valid_number(blood->QueryField(i,0), value);
 			valid_number(blood->QueryField(i,1), rmin);
 			valid_number(blood->QueryField(i,2), rmax);
-			//printMessage("CharAnimations", "Setting up blood color: ", WHITE);
-			printf("%02x %04x-%04x ", (unsigned int) value, (unsigned int) rmin, (unsigned int) rmax);
 			if (value>255 || rmin>0xffff || rmax>0xffff || value<0 || rmin<0 || rmax<0) {
+				printMessage("CharAnimations", "bloodclr entry:", LIGHT_RED);
+				printf("%02x %04x-%04x ", (unsigned int) value, (unsigned int) rmin, (unsigned int) rmax);
 				printStatus("Invalid value!", LIGHT_RED);
 				continue;
 			}
 			for(int j=0;j<AvatarsCount;j++) {
-				if (rmax>AvatarTable[j].AnimID) break;
-				if (rmin<AvatarTable[j].AnimID) continue;
+				if (rmax<AvatarTable[j].AnimID) break;
+				if (rmin>AvatarTable[j].AnimID) continue;
 				AvatarTable[j].BloodColor = value;
 			}
-			printStatus("Done", GREEN);
 		}
 	}
 }
diff --git a/gemrb/override/bg2/bloodclr.2da b/gemrb/override/bg2/bloodclr.2da
index 5e17350..1b33a30 100644
--- a/gemrb/override/bg2/bloodclr.2da
+++ b/gemrb/override/bg2/bloodclr.2da
@@ -5,6 +5,8 @@ NORMAL     0x2f       0x1000     0xffff
 PURPLE     0x2d       0x4300     0x43ff     

 MSKEL      0x25       0x5403     0x5403     

 DOOMG      0x22       0x5405     0x5406     

+MSKEL      0x25       0x6403     0x6403     

+DOOMG      0x22       0x6405     0x6406     

 YELLOW     0x32       0x7300     0x73ff     

 PURPLE     0x3c       0x7500     0x75ff     

 YELLOW     0x32       0x7600     0x76ff     


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


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