hedgewars/GearDrawing.inc
changeset 4047 6c07a302b7c0
parent 4044 de7170e51cc6
child 4077 e7d838d063a4
--- a/hedgewars/GearDrawing.inc	Sun Oct 31 18:04:02 2010 +0100
+++ b/hedgewars/GearDrawing.inc	Sun Oct 31 18:04:21 2010 +0100
@@ -278,15 +278,8 @@
                 defaultPos:= false
                 end;
             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 + (CurAmmoGear^.Power),
-                        SpritesData[sprVampiric].Texture, 4.5);
-                Tint($FF, $FF, $FF, $FF);
+                DrawRotated(sprHandResurrector, sx, sy, 0, 0); 
+                defaultPos:= false
                 end;
             gtKamikaze: begin
                 if CurAmmoGear^.Pos = 0 then
@@ -670,6 +663,11 @@
     Tint($00, $FF, $40, $80);
     DrawRotatedTextureF(SpritesData[sprSmokeWhite].texture, 1.5, 0, 0, sx, sy, 0, 1, 22, 22, 360 - (RealTicks shr 37) mod 360);
     end;
+if HH^.Effects[heResurrected] then
+    begin
+    Tint($f5, $db, $35, $20);
+    DrawSprite(sprVampiric, sx - 24, sy - 24, 0);
+    end;
 
 if Gear^.Invulnerable then
     begin
@@ -728,7 +726,7 @@
                     if Gear^.Health > 0 then
                         begin
                         //Tint($33, $33, $FF, max($40, floor($FF * abs(1 - (GameTicks mod (6000 div Gear^.Health)) / 750))));
-                        Tint($33, $33, $FF, max($40, floor($FF * abs(1 - (GameTicks mod 1500) / (750 + Gear^.Health)))));
+                        Tint($f5, $db, $35, max($40, floor($FF * abs(1 - (GameTicks mod 1500) / (750 + Gear^.Health)))));
                         //Tint($FF, $FF, $FF, max($40, floor($FF * abs(1 - (RealTicks mod 1500) / 750))));
                         DrawSprite(sprVampiric, x - 24, y - 24, 0);
                         Tint($FF, $FF, $FF, $FF)
@@ -860,6 +858,12 @@
                     DrawRotatedTextureF(SpritesData[sprSmokeWhite].texture, 3, 0, 0, x, y, 0, 1, 22, 22, (RealTicks shr 36 + Gear^.UID * 100) mod 360);
                     Tint($FF, $FF, $FF, $FF)
                     end;
+     gtResurrector: begin
+                    DrawRotated(sprCross, x, y, 0, 0);
+                    Tint($f5, $db, $35, max($00, floor($C0 * abs(1 - (GameTicks mod 6000) / 3000))));
+                    DrawTexture(x - 108, y - 108, SpritesData[sprVampiric].Texture, 4.5);
+                    Tint($FF, $FF, $FF, $FF);
+                    end;
          end;
       if Gear^.RenderTimer and (Gear^.Tex <> nil) then DrawCentered(x + 8, y + 8, Gear^.Tex);
       Gear:= Gear^.NextGear