# HG changeset patch
# User Xeli
# Date 1329424339 -3600
# Node ID 029c27660dd22c0fa3dcc20807b76d1be0d1a458
# Parent  79c96abd06d63fb3a3c59ebc66f4505a2c68304e
move the aim buttons to be above the jump button

diff -r 79c96abd06d6 -r 029c27660dd2 hedgewars/uTeams.pas
--- a/hedgewars/uTeams.pas	Thu Feb 16 17:48:03 2012 +0100
+++ b/hedgewars/uTeams.pas	Thu Feb 16 21:32:19 2012 +0100
@@ -190,7 +190,6 @@
         begin
         animateWidget(@arrowUp, true, true);
         animateWidget(@arrowDown, true, true);
-        animateWidget(@arrowRight, false, true);
         end;
     end
 else
@@ -198,7 +197,6 @@
         begin
         animateWidget(@arrowUp, true, false);
         animateWidget(@arrowDown, true, false);
-        animateWidget(@arrowRight, false, true);
         end;
 {$ENDIF}
 AmmoMenuInvalidated:= true;
diff -r 79c96abd06d6 -r 029c27660dd2 hedgewars/uWorld.pas
--- a/hedgewars/uWorld.pas	Thu Feb 16 17:48:03 2012 +0100
+++ b/hedgewars/uWorld.pas	Thu Feb 16 21:32:19 2012 +0100
@@ -245,8 +245,8 @@
     begin
     show:= true;
     sprite:= sprArrowLeft;
-    x:= -(cScreenWidth shr 1);
-    y:= -Round(spritesData[sprite].Texture^.h*buttonScale) + cScreenHeight  - Round(spritesData[sprite].Texture^.h*buttonScale);
+    x:= -(cScreenWidth shr 1) + Round(spritesData[sprite].Texture^.h*buttonScale * 0.25);
+    y:= -Round(spritesData[sprite].Texture^.h*buttonScale) + cScreenHeight  - Round(spritesData[sprite].Texture^.h*buttonScale *0.5);
     width:= Round(spritesData[sprite].Texture^.h * buttonScale);
     height:= Round(spritesData[sprite].Texture^.h * buttonScale);
     hOffset:= 0;
@@ -256,27 +256,20 @@
     begin
     show:= true;
     sprite:= sprArrowRight;
-    x:= -(cScreenWidth shr 1)+ Round(spritesData[sprite].Texture^.h * buttonScale);
-    y:= -Round(spritesData[sprite].Texture^.h*buttonScale) + cScreenHeight - Round(spritesData[sprite].Texture^.h*buttonScale);
+    x:= -(cScreenWidth shr 1) + Round(spritesData[sprite].Texture^.h * buttonScale *1.5);
+    y:= -Round(spritesData[sprite].Texture^.h*buttonScale) + cScreenHeight - Round(spritesData[sprite].Texture^.h*buttonScale * 0.5);
     width:= Round(spritesData[sprite].Texture^.w * buttonScale);
     height:= Round(spritesData[sprite].Texture^.h * buttonScale);
     hOffset:= 0;
     vOffset:= 0;
-    with moveAnim do
-        begin
-        targetToX:= arrowRight.x;
-        targetToY:= arrowRight.y;
-        targetFromX:= arrowRight.x + Round(spritesData[sprArrowUp].Texture^.h * buttonScale);
-        targetFromY:= arrowRight.y;
-        end;
     end;
 
 with arrowUp do
     begin
     show:= false;
     sprite:= sprArrowUp;
-    x:= -(cScreenWidth shr 1) + Round(spritesData[sprite].Texture^.h * buttonScale);
-    y:= arrowRight.y;
+    x:= (cScreenWidth shr 1) - Round(spritesData[sprite].Texture^.w * buttonScale *2);
+    y:= backjump.y -Round(spritesData[sprite].Texture^.h * buttonScale*2.25);
     width:= Round(spritesData[sprite].Texture^.w * buttonScale);
     height:= Round(spritesData[sprite].Texture^.h * buttonScale);
     hOffset:= 0;
@@ -285,8 +278,8 @@
          begin
          targetToX:= arrowUp.x;
          targetToY:= arrowUp.y;
-         targetFromX:= arrowUp.x;
-         targetFromY:= -Round(spritesData[sprite].Texture^.h*buttonScale) + cScreenHeight - Round(spritesData[sprite].Texture^.h*buttonScale*2);
+         targetFromX:= arrowUp.x - Round(spritesData[sprite].Texture^.w * buttonScale *0.75);
+         targetFromY:= arrowUp.y;
          end;
     end;
 
@@ -294,18 +287,18 @@
     begin
     show:= false;
     sprite:= sprArrowDown;
-    x:= -(cScreenWidth shr 1) + Round(spritesData[sprArrowUp].Texture^.h * buttonScale);
-    y:= arrowRight.y;
-    width:= Round(spritesData[sprArrowDown].Texture^.w * buttonScale);
-    height:= Round(spritesData[sprArrowDown].Texture^.h * buttonScale);
+    x:= (cScreenWidth shr 1) - Round(spritesData[sprite].Texture^.w * buttonScale * 2);
+    y:= backjump.y -Round(spritesData[sprite].Texture^.h * buttonScale *2.25);
+    width:= Round(spritesData[sprite].Texture^.w * buttonScale);
+    height:= Round(spritesData[sprite].Texture^.h * buttonScale);
     hOffset:= 0;
     vOffset:= 0;
     with moveAnim do
         begin
         targetToX:= arrowDown.x;
         targetToY:= arrowDown.y;
-        targetFromX:= arrowDown.x;
-        targetFromY:= -Round(spritesData[sprArrowDown].Texture^.h*buttonscale) + cScreenHeight;
+        targetFromX:= arrowDown.x + Round(spritesData[sprite].Texture^.w * buttonScale *0.75);
+        targetFromY:= arrowDown.y;
         end;
     end;
 
@@ -625,7 +618,6 @@
                         begin
                         animateWidget(@arrowUp, true, true);
                         animateWidget(@arrowDown, true, true);
-                        animateWidget(@arrowRight, false, true);
                         end;
                     end
                 else
@@ -633,7 +625,6 @@
                         begin
                         animateWidget(@arrowUp, true, false);
                         animateWidget(@arrowDown, true, false);
-                        animateWidget(@arrowRight, false, true);
                         end;
 {$ENDIF}