Mercurial Mercurial > hedgewars / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hedgewars/uGearsRender.pas
changeset 5740 caf10b231b08
parent 5728 aca2acfba4ca
child 5787 f2caf41f2984 
--- a/hedgewars/uGearsRender.pas	Fri Sep 02 12:39:29 2011 -0400
+++ b/hedgewars/uGearsRender.pas	Fri Sep 02 12:46:17 2011 -0400
@@ -1083,13 +1083,18 @@
        gtStructure: DrawSprite(sprTarget, x - 16, y - 16, 0);
           gtTardis: if Gear^.Pos <> 4 then
                         begin
-                        if (Gear^.Pos = 1) or (Gear^.Pos = 3) then
-                            Tint(Gear^.Hedgehog^.Team^.Clan^.Color shl 8 or max($00, round(Gear^.Power * (1-abs(0.5 - (GameTicks mod 2000) / 2000)))))
-                        else Tint(Gear^.Hedgehog^.Team^.Clan^.Color shl 8 or $FF);
-                        DrawSprite(sprTardis, x-26, y-63,0);
+                        if Gear^.Pos = 2 then Tint(Gear^.Hedgehog^.Team^.Clan^.Color shl 8 or $FF)
+                        else Tint(Gear^.Hedgehog^.Team^.Clan^.Color shl 8 or max($00, round(Gear^.Power * (1-abs(0.5 - (GameTicks mod 2000) / 2000)))));
+                        DrawSprite(sprTardis, x-24, y-63,0);
+                        if Gear^.Pos = 2 then Tint($FF, $FF, $FF, $FF)
+			else Tint($FF,$FF,$FF,max($00, round(Gear^.Power * (1-abs(0.5 - (GameTicks mod 2000) / 2000)))));
+                        DrawSprite(sprTardis, x-24, y-63,1);
+                        if Gear^.Pos <> 2 then Tint($FF, $FF, $FF, $FF)
+(*
                         Tint(Gear^.Hedgehog^.Team^.Clan^.Color shl 8 or max($00, round(Gear^.Power * abs(1 - (RealTicks mod 500) / 250))));
                         DrawTexture(x-6, y-70, SpritesData[sprVampiric].Texture, 0.25);
                         Tint($FF, $FF, $FF, $FF)
+*)
                         end;
hedgewars