# HG changeset patch # User koda # Date 1258324002 0 # Node ID 0c3d5549912e189aa2437cb5b360e2ea354e28cb # Parent 9332f744bbdf062918ab4d3dc6199151ab22bdee Color Fix in PPC + files fallbacks diff -r 9332f744bbdf -r 0c3d5549912e hedgewars/CCHandlers.inc --- 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; diff -r 9332f744bbdf -r 0c3d5549912e hedgewars/uStore.pas --- 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 diff -r 9332f744bbdf -r 0c3d5549912e share/hedgewars/Data/Themes/Castle/Sky-lowres.png Binary file share/hedgewars/Data/Themes/Castle/Sky-lowres.png has changed diff -r 9332f744bbdf -r 0c3d5549912e share/hedgewars/Data/Themes/Underwater/Flake-lowres.png Binary file share/hedgewars/Data/Themes/Underwater/Flake-lowres.png has changed