# HG changeset patch
# User Tobias Neumann <mail@tobias-neumann.eu>
# Date 1288467821 -7200
# Node ID 8de77872ef21751fd21b1c0d39222972701386ca
# Parent  6042256178a8031f04dc3a36f0ddd6dce71b5351
Resurrector: Levitate hog + show cross

diff -r 6042256178a8 -r 8de77872ef21 hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc	Sat Oct 30 20:04:38 2010 +0200
+++ b/hedgewars/GSHandlers.inc	Sat Oct 30 21:43:41 2010 +0200
@@ -4100,6 +4100,7 @@
             $FF);*)
 
     doStepHedgehogMoving(hh^.Gear);
+    hh^.Gear^.Y := Gear^.Y;
 
     if ((Gear^.Message and gmUp) <> 0) then 
         begin
@@ -4107,6 +4108,10 @@
         end 
     else if (GameTicks and $1FF) <> 0 then exit;
 
+    if Gear^.Power < 45 then begin
+        inc(Gear^.Power);
+        Gear^.Y := Gear^.Y - _1;
+    end;
 
     graves := GearsNear(hh^.Gear, gtGrave, Gear^.Radius);
 
@@ -4148,6 +4153,8 @@
                     LoadImage(Pathz[ptHats] + '/Reserved/Zombie', ifNone),
                     True);
             end;
+
+        hh^.Gear^.dY := _0;
         StopSound(Gear^.SoundChannel);
         Gear^.Timer := 250;
         Gear^.doStep := @doStepIdle;
diff -r 6042256178a8 -r 8de77872ef21 hedgewars/GearDrawing.inc
--- a/hedgewars/GearDrawing.inc	Sat Oct 30 20:04:38 2010 +0200
+++ b/hedgewars/GearDrawing.inc	Sat Oct 30 21:43:41 2010 +0200
@@ -280,6 +280,8 @@
             gtResurrector: begin
                 DrawRotated(sprHandResurrector, hwRound(Gear^.X) + WorldDx,
                         hwRound(Gear^.Y) + WorldDy, 0, 0); 
+                DrawRotated(sprCross, hwRound(CurAmmoGear^.X) + WorldDx,
+                        hwRound(CurAmmoGear^.Y) + WorldDy + (CurAmmoGear^.Power), 0, 0);
                 defaultPos := false;
                 Tint($33, $33, $FF, max($00, floor($C0 * abs(1 - (GameTicks mod 6000) / 3000))));
                 DrawTexture(sx - 108, sy - 108, SpritesData[sprVampiric].Texture, 4.5);
diff -r 6042256178a8 -r 8de77872ef21 hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas	Sat Oct 30 20:04:38 2010 +0200
+++ b/hedgewars/uConsts.pas	Sat Oct 30 21:43:41 2010 +0200
@@ -74,7 +74,8 @@
             sprBigExplosion, sprSmokeRing, sprBeeTrace, sprEgg, sprTargetBee, sprHandBee,
             sprFeather, sprPiano, sprHandSineGun, sprPortalGun, sprPortal,
             sprCheese, sprHandCheese, sprHandFlamethrower, sprChunk, sprNote,
-            sprSMineOff, sprSMineOn, sprHandSMine, sprHammer, sprHandResurrector
+            sprSMineOff, sprSMineOn, sprHandSMine, sprHammer,
+            sprHandResurrector, sprCross
             );
 
     // Gears that interact with other Gears and/or Land
@@ -817,8 +818,15 @@
             (FileName: 'amResurrector'; Path: ptHedgehog; AltPath: ptNone;
                 Texture: nil; Surface: nil; Width: 32; Height: 32;
                 imageWidth: 0; imageHeight: 0; saveSurf: false; priority:
-                tpMedium; getDimensions: false; getImageDimensions: true) 
-            ); // sprHandResurrector
+                tpMedium; getDimensions: false; getImageDimensions: true),
+            //sprHandResurrector
+            (FileName: 'Cross'; Path: ptGraphics; altPath: ptNone;
+                Texture: nil; Surface: nil; Width: 108; Height: 138;
+                imageWidth: 0; imageHeight: 0; saveSurf: false; priority:
+                tpMedium; getDimensions: false; getImageDimensions: true)
+            //sprCross
+            );
+
 
     Wavez: array [TWave] of record
             Sprite: TSprite;
diff -r 6042256178a8 -r 8de77872ef21 share/hedgewars/Data/Graphics/Cross.png
Binary file share/hedgewars/Data/Graphics/Cross.png has changed