Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add awesome new TARDIS art
authornemo
Fri, 02 Sep 2011 12:46:17 -0400
changeset 5740 caf10b231b08
parent 5739 42cf6712ef43
child 5741 a406d8a5000d
Add awesome new TARDIS art
hedgewars/uGearsRender.pas file | annotate | diff | comparison | revisions
hedgewars/uVariables.pas file | annotate | diff | comparison | revisions
share/hedgewars/Data/Graphics/TARDIS.png file | annotate | diff | comparison | revisions
share/hedgewars/Data/Graphics/TARDIS.xcf file | annotate | diff | comparison | revisions 
--- 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;
 
 
--- a/hedgewars/uVariables.pas	Fri Sep 02 12:39:29 2011 -0400
+++ b/hedgewars/uVariables.pas	Fri Sep 02 12:46:17 2011 -0400
@@ -619,7 +619,7 @@
             (FileName:  'SDDroplet'; Path: ptCurrTheme; AltPath: ptSuddenDeath; Texture: nil; Surface: nil;
             Width:  16; Height: 16; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpHighest; getDimensions: false; getImageDimensions: true),// sprSDDroplet
             (FileName:  'TARDIS'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
-            Width:  0; Height: 0; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpMedium; getDimensions: true; getImageDimensions: true)// sprTardis
+            Width:  48; Height: 79; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpHighest; getDimensions: false; getImageDimensions: true)// sprTardis
             );
 
 
Binary file share/hedgewars/Data/Graphics/TARDIS.png has changed
Binary file share/hedgewars/Data/Graphics/TARDIS.xcf has changed
hedgewars