Color Fix in PPC + files fallbacks
authorkoda
Sun, 15 Nov 2009 22:26:42 +0000
changeset 2624 0c3d5549912e
parent 2623 9332f744bbdf
child 2625 7bdca4b4092d
Color Fix in PPC + files fallbacks
hedgewars/CCHandlers.inc
hedgewars/uStore.pas
share/hedgewars/Data/Themes/Castle/Sky-lowres.png
share/hedgewars/Data/Themes/Underwater/Flake-lowres.png
--- a/hedgewars/CCHandlers.inc	Sun Nov 15 19:43:58 2009 +0000
+++ b/hedgewars/CCHandlers.inc	Sun Nov 15 22:26:42 2009 +0000
@@ -74,6 +74,10 @@
 procedure chAddTeam(var s: shortstring);
 var Color: Longword;
     ts: shortstring;
+{$IFNDEF ENDIAN_LITTLE}
+    tmpA, tmpR, tmpG, tmpB: byte;
+    tmpColor: LongWord = 0;
+{$ENDIF}
 begin
 if isDeveloperMode then
    begin
@@ -81,8 +85,9 @@
    val(s, Color);
    TryDo(Color <> 0, 'Error: black team color', true);
 
-   Color:= Color or AMask;
-
+   // color is always in ARGB so the mask must be constant
+   Color:= Color or $FF000000;
+ 	
    AddTeam(Color);
    CurrentTeam^.TeamName:= ts;
    if GameType in [gmtDemo, gmtSave] then CurrentTeam^.ExtDriven:= true;
--- a/hedgewars/uStore.pas	Sun Nov 15 19:43:58 2009 +0000
+++ b/hedgewars/uStore.pas	Sun Nov 15 22:26:42 2009 +0000
@@ -991,7 +991,13 @@
         substr:= copy(s, prevpos+1, pos-prevpos-1);
         if Length(substr) <> 0 then
            begin
-           tmpsurf:= TTF_RenderUTF8_Blended(Fontz[Font].Handle, Str2PChar(substr), cNearBlackColor);
+           tmpsurf:= TTF_RenderUTF8_Blended(Fontz[Font].Handle, Str2PChar(substr), 
+{$IFDEF ENDIAN_LITTLE}
+		cNearBlackColor
+{$ELSE}
+		$100000FF
+{$ENDIF}
+		); // do not remove me
 	   tmpsurf:= doSurfaceConversion(tmpsurf);
            rect.x:= edgeHeight + 1 + ((i - w) div 2);
            // trying to more evenly position the text, vertically
Binary file share/hedgewars/Data/Themes/Castle/Sky-lowres.png has changed
Binary file share/hedgewars/Data/Themes/Underwater/Flake-lowres.png has changed