[Gemrb-commits] SF.net SVN: gemrb: [4640] gemrb/trunk/gemrb/plugins/Core/CharAnimations.cpp

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

Revision: 4640
          http://gemrb.svn.sourceforge.net/gemrb/?rev=4640&view=rev
Author:   avenger_teambg
Date:     2007-05-05 23:45:35 -0700 (Sat, 05 May 2007)

Log Message:
-----------
fixed a palette problem causing assert crash

Modified Paths:
--------------
    gemrb/trunk/gemrb/plugins/Core/CharAnimations.cpp

Modified: gemrb/trunk/gemrb/plugins/Core/CharAnimations.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/CharAnimations.cpp	2007-05-05 09:51:23 UTC (rev 4639)
+++ gemrb/trunk/gemrb/plugins/Core/CharAnimations.cpp	2007-05-06 06:45:35 UTC (rev 4640)
@@ -205,7 +205,7 @@
 {
 	OffhandRef[0] = ref[0];
 	OffhandRef[1] = ref[1];
-	
+
 	// TODO: Only drop shield/offhand anims?
 	DropAnims();
 	core->FreePalette(palette[PAL_OFFHAND], 0);
@@ -778,7 +778,7 @@
 		}
 
 		if (part < actorPartCount) {
-			if (!palette[PAL_MAIN] && (GlobalColorMod.type!=RGBModifier::NONE) || (NoPalette()!=1) ) {
+			if (!palette[PAL_MAIN] && ((GlobalColorMod.type!=RGBModifier::NONE) || (NoPalette()!=1)) ) {
 				// This is the first time we're loading an Animation.
 				// We copy the palette of its first frame into our own palette
 				palette[PAL_MAIN] = 
@@ -806,7 +806,7 @@
 				SetupColors(PAL_HELMET);
 			}
 		}
-	
+
 		//animation is affected by game flags
 		a->gameAnimation = true;
 		a->SetPos( 0 );
@@ -864,7 +864,7 @@
 		case IE_ANI_CODE_MIRROR:
 			Anims[StanceID][Orient] = anims;
 			break;
-			
+
 		case IE_ANI_SIX_FILES: //16 anims some are stored elsewhere
 		case IE_ANI_ONE_FILE: //16 orientations
 			Anims[StanceID][Orient] = anims;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.