# HG changeset patch
# User smaxx
# Date 1284462349 -7200
# Node ID 4d462b29428e595092f21b4e85cf4c03e4829934
# Parent  4629026ff75a4a87ff178dc70630a457cc9eb9a5
Engine:
* Updated the crosshair and made it look less "blocky"

diff -r 4629026ff75a -r 4d462b29428e hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas	Tue Sep 14 00:17:22 2010 -0400
+++ b/hedgewars/uConsts.pas	Tue Sep 14 13:05:49 2010 +0200
@@ -227,8 +227,8 @@
     rqLowRes      = $00000001;  // use half land array
     rqBlurryLand  = $00000002;  // downscaled terrain
     rqNoBackground= $00000004;  // don't draw background
-    rqSimpleRope  = $00000008;  // avoid drawing rope
-    rq2DWater     = $00000010;  // disabe 3D water effect
+    rqSimpleRope  = $00000008;  // draw rope using lines only
+    rq2DWater     = $00000010;  // disable 3D water effect
     rqFancyBoom   = $00000020;  // no fancy explosion effects
     rqKillFlakes  = $00000040;  // no flakes
     rqSlowMenu    = $00000080;  // ammomenu appears with no animation
diff -r 4629026ff75a -r 4d462b29428e hedgewars/uStore.pas
--- a/hedgewars/uStore.pas	Tue Sep 14 00:17:22 2010 -0400
+++ b/hedgewars/uStore.pas	Tue Sep 14 13:05:49 2010 +0200
@@ -274,27 +274,27 @@
                             texsurf:= LoadImage(Pathz[ptHats] + '/Reserved/' + Copy(Hat,9,Length(s)-8), ifNone)
                         else
                             texsurf:= LoadImage(Pathz[ptHats] + '/' + Hat, ifNone);
-                            if texsurf <> nil then
+                        if texsurf <> nil then
                             begin
-                                HatTex:= Surface2Tex(texsurf, true);
-                                SDL_FreeSurface(texsurf)
+                            HatTex:= Surface2Tex(texsurf, true);
+                            SDL_FreeSurface(texsurf)
                             end;
-                            texsurf:= nil;
+                        texsurf:= nil;
                         end
                     end;
         end;
     MissionIcons:= LoadImage(Pathz[ptGraphics] + '/missions', ifCritical);
     iconsurf:= SDL_CreateRGBSurface(SDL_SWSURFACE, 28, 28, 32, RMask, GMask, BMask, AMask);
-        if iconsurf <> nil then
+    if iconsurf <> nil then
         begin
-            r.x:= 0;
-            r.y:= 0;
-            r.w:= 28;
-            r.h:= 28;
-            DrawRoundRect(@r, cWhiteColor, cNearBlackColor, iconsurf, true);
-            ropeIconTex:= Surface2Tex(iconsurf, false);
-            SDL_FreeSurface(iconsurf);
-            iconsurf:= nil;
+        r.x:= 0;
+        r.y:= 0;
+        r.w:= 28;
+        r.h:= 28;
+        DrawRoundRect(@r, cWhiteColor, cNearBlackColor, iconsurf, true);
+        ropeIconTex:= Surface2Tex(iconsurf, false);
+        SDL_FreeSurface(iconsurf);
+        iconsurf:= nil;
         end;
     end;
 
@@ -325,7 +325,7 @@
 
         // make black pixel be alpha-transparent
         for i:= 0 to texsurf^.w * texsurf^.h - 1 do
-            if PLongwordArray(texsurf^.pixels)^[i] = AMask then PLongwordArray(texsurf^.pixels)^[i]:= 0;
+            if PLongwordArray(texsurf^.pixels)^[i] = AMask then PLongwordArray(texsurf^.pixels)^[i]:= (RMask or GMask or BMask) and Color;
 
         if SDL_MustLock(texsurf) then
             SDL_UnlockSurface(texsurf);
@@ -1082,9 +1082,7 @@
 var tmpsurf: PSDL_Surface;
     s: shortstring;
 begin
-    WriteToConsole(msgLoading + filename + '.png (flags: ' + inttostr(imageFlags)+') ');
-{$IFDEF DEBUGFILE}
-    WriteToConsole('[flag translation:');
+    WriteToConsole(msgLoading + filename + '.png [flags:');
     if imageFlags = ifNone then
         WriteToConsole(' None')
     else
@@ -1095,7 +1093,6 @@
         if (imageFlags and ifIgnoreCaps) <> 0 then WriteToConsole(' IgnoreCaps');
         end;
     WriteToConsole('] ');
-{$ENDIF}
 
     s:= filename + '.png';
     tmpsurf:= IMG_Load(Str2PChar(s));
@@ -1111,7 +1108,7 @@
         SDL_FreeSurface(tmpsurf);
         OutError(msgFailedSize, (imageFlags and ifCritical) <> 0);
         // dummy surface to replace non-critical textures that failed to load due to their size
-        exit(SDL_CreateRGBSurface(SDL_SWSURFACE, 32, 32, 32, RMask, GMask, BMask, AMask));
+        exit(SDL_CreateRGBSurface(SDL_SWSURFACE, 2, 2, 32, RMask, GMask, BMask, AMask));
     end;
 
     tmpsurf:= doSurfaceConversion(tmpsurf);
diff -r 4629026ff75a -r 4d462b29428e share/hedgewars/Data/Graphics/Crosshair.png
Binary file share/hedgewars/Data/Graphics/Crosshair.png has changed