# HG changeset patch
# User smxx
# Date 1267616282 0
# Node ID b7a63650329800fa0ba9de9c5ef9944687adcc1c
# Parent  5cf48744a70071bf141705534f9bcc86197d9605
Engine:
* Added new animated target pointer
* Addd new "preview" cursor for teleport

diff -r 5cf48744a700 -r b7a636503298 hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas	Wed Mar 03 11:22:23 2010 +0000
+++ b/hedgewars/uConsts.pas	Wed Mar 03 11:38:02 2010 +0000
@@ -72,7 +72,7 @@
 			sprThoughtCorner, sprThoughtEdge, sprThoughtTail,
 			sprShoutCorner, sprShoutEdge, sprShoutTail,
 			sprSniperRifle, sprBubbles, sprJetpack, sprHealth, sprHandMolotov, sprMolotov,
-			sprSmoke, sprShell, sprDust, sprExplosives);
+			sprSmoke, sprShell, sprDust, sprExplosives, sprAmTeleport);
 
 	TGearType = (gtAmmo_Bomb, gtHedgehog, gtAmmo_Grenade, gtHealthTag, // 3
 			gtGrave, gtUFO, gtShotgunShot, gtPickHammer, gtRope, // 8
@@ -675,7 +675,9 @@
 			(FileName: 'Dust'; Path: ptCurrTheme; AltPath: ptGraphics; Texture: nil; Surface: nil;
 			Width:  22; Height: 22; imageWidth: 0; imageHeight: 0; saveSurf: false),// sprDust
 			(FileName: 'Explosives'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
-			Width:  48; Height: 48; imageWidth: 0; imageHeight: 0; saveSurf: false) // sprExplosives
+			Width:  48; Height: 48; imageWidth: 0; imageHeight: 0; saveSurf: false),// sprExplosives
+			(FileName: 'amTeleport'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+			Width:  64; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false) // sprAmTeleport
 			);
 
 	Wavez: array [TWave] of record
@@ -1228,8 +1230,8 @@
 			maxAngle: 0;
 			isDamaging: false;
 			SkipTurns: 0;
-			PosCount: 1;
-			PosSprite: sprWater),
+			PosCount: 2;
+			PosSprite: sprAmTeleport),
 			(NameId: sidSwitch;
 			NameTex: nil;
 			Probability: 100;
diff -r 5cf48744a700 -r b7a636503298 hedgewars/uWorld.pas
--- a/hedgewars/uWorld.pas	Wed Mar 03 11:22:23 2010 +0000
+++ b/hedgewars/uWorld.pas	Wed Mar 03 11:38:02 2010 +0000
@@ -496,7 +496,8 @@
 
 {$WARNINGS OFF}
 // Target
-if TargetPoint.X <> NoPointX then DrawSprite(sprTargetP, TargetPoint.X + WorldDx - 16, TargetPoint.Y + WorldDy - 16, 0);
+if TargetPoint.X <> NoPointX then
+	DrawRotatedF(sprTargetP, TargetPoint.X + WorldDx, TargetPoint.Y + WorldDy, 0, 0, (RealTicks shr 3) mod 360);
 {$WARNINGS ON}
 
 {$IFDEF IPHONEOS}
@@ -775,9 +776,13 @@
          i:= Ammo^[CurSlot, CurAmmo].Pos;
          with Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType] do
            if PosCount > 1 then
+              begin
+              glColor4f(1, 1, 1, abs(1 - (RealTicks mod 1500) / 750));
               DrawSprite(PosSprite, CursorPoint.X - SpritesData[PosSprite].Width div 2,
                                     cScreenHeight - CursorPoint.Y - SpritesData[PosSprite].Height div 2,
                                     i);
+              glColor4f(1, 1, 1, 1)
+              end;
          end;
    DrawSprite(sprArrow, CursorPoint.X, cScreenHeight - CursorPoint.Y, (RealTicks shr 6) mod 8)
    end;
diff -r 5cf48744a700 -r b7a636503298 misc/xfire/Xfire Game SDK.url
--- a/misc/xfire/Xfire Game SDK.url	Wed Mar 03 11:22:23 2010 +0000
+++ b/misc/xfire/Xfire Game SDK.url	Wed Mar 03 11:38:02 2010 +0000
@@ -1,5 +1,5 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-URL=http://www.xfire.com/cms/xf_game_sdk
-IDList=
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2
+[InternetShortcut]
+URL=http://www.xfire.com/cms/xf_game_sdk
+IDList=
diff -r 5cf48744a700 -r b7a636503298 share/hedgewars/Data/Graphics/Targetp.png
Binary file share/hedgewars/Data/Graphics/Targetp.png has changed
diff -r 5cf48744a700 -r b7a636503298 share/hedgewars/Data/Graphics/amTeleport.png
Binary file share/hedgewars/Data/Graphics/amTeleport.png has changed