Tiy adds active weapon icons for a bunch of things.
authornemo
Sun, 14 Mar 2010 16:47:29 +0000
changeset 2987 3abaf01b4ce3
parent 2986 c0c91cd3f423
child 2988 42fa7fbee89a
Tiy adds active weapon icons for a bunch of things.
QTfrontend/res/Settings.png
hedgewars/uConsts.pas
hedgewars/uGears.pas
share/hedgewars/Data/Graphics/Hedgehog/amCake.png
share/hedgewars/Data/Graphics/Hedgehog/amCluster.png
share/hedgewars/Data/Graphics/Hedgehog/amConstruction.png
share/hedgewars/Data/Graphics/Hedgehog/amDynamite.png
share/hedgewars/Data/Graphics/Hedgehog/amGrenade.png
share/hedgewars/Data/Graphics/Hedgehog/amHellish.png
share/hedgewars/Data/Graphics/Hedgehog/amMelon.png
share/hedgewars/Data/Graphics/Hedgehog/amMine.png
share/hedgewars/Data/Graphics/Hedgehog/amMortar.png
share/hedgewars/Data/Graphics/Hedgehog/amSeduction.png
share/hedgewars/Data/Graphics/Hedgehog/amSkip.png
share/hedgewars/Data/Graphics/Hedgehog/amVamp.png
share/hedgewars/Data/Maps/cheese/map.png
Binary file QTfrontend/res/Settings.png has changed
--- a/hedgewars/uConsts.pas	Sun Mar 14 14:59:08 2010 +0000
+++ b/hedgewars/uConsts.pas	Sun Mar 14 16:47:29 2010 +0000
@@ -73,7 +73,9 @@
             sprShoutCorner, sprShoutEdge, sprShoutTail,
             sprSniperRifle, sprBubbles, sprJetpack, sprHealth, sprHandMolotov, sprMolotov,
             sprSmoke, sprSmokeWhite, sprShell, sprDust, sprExplosives, sprExplosivesRoll,
-            sprAmTeleport, sprSplash, sprDroplet, sprBirdy);
+            sprAmTeleport, sprSplash, sprDroplet, sprBirdy, sprHandCake, sprHandConstruction,
+            sprHandGrenade, sprHandMelon, sprHandMortar, sprHandSkip, sprHandCluster,
+            sprHandDynamite, sprHandHellish, sprHandMine, sprHandSeduction, sprHandVamp);
 
     TGearType = (gtAmmo_Bomb, gtHedgehog, gtAmmo_Grenade, gtHealthTag, // 3
             gtGrave, gtUFO, gtShotgunShot, gtPickHammer, gtRope, // 8
@@ -683,7 +685,31 @@
             (FileName: 'Droplet'; Path: ptCurrTheme; AltPath: ptGraphics; Texture: nil; Surface: nil;
             Width:  16; Height: 16; imageWidth: 0; imageHeight: 0; saveSurf: false), // sprDroplet
             (FileName: 'Birdy'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
-            Width:  75; Height: 75; imageWidth: 0; imageHeight: 0; saveSurf: false)// sprBirdy
+            Width:  75; Height: 75; imageWidth: 0; imageHeight: 0; saveSurf: false), // sprBirdy
+            (FileName:  'amCake'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+            Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false),// sprHandCake
+            (FileName:  'amConstruction'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+            Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false),// sprHandConstruction
+            (FileName:  'amGrenade'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+            Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false),// sprHandGrenade
+            (FileName:  'amMelon'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+            Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false),// sprHandMelon
+            (FileName:  'amMortar'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+            Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false),// sprHandMortar
+            (FileName:  'amSkip'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+            Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false),// sprHandSkip
+            (FileName:  'amCluster'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+            Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false),// sprHandCluster
+            (FileName:  'amDynamite'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+            Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false),// sprHandDynamite
+            (FileName:  'amHellish'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+            Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false),// sprHandHellish
+            (FileName:  'amMine'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+            Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false),// sprHandMine
+            (FileName:  'amSeduction'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+            Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false),// sprHandSeduction
+            (FileName:  'amVamp'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+            Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false)// sprHandVamp
             );
 
     Wavez: array [TWave] of record
--- a/hedgewars/uGears.pas	Sun Mar 14 14:59:08 2010 +0000
+++ b/hedgewars/uGears.pas	Sun Mar 14 16:47:29 2010 +0000
@@ -1180,8 +1180,9 @@
     begin
         amt:= CurrentHedgehog^.Ammo^[CurrentHedgehog^.CurSlot, CurrentHedgehog^.CurAmmo].AmmoType;
         case amt of
-            amBazooka,
-            amMortar: DrawRotated(sprHandBazooka, hx, hy, hwSign(Gear^.dX), aangle);
+//, sprHandCake, sprHandConstruction, sprHandGrenade, sprHandMelon, sprHandMortar, sprHandSkip, sprHandCluster, sprHandDynamite, sprHandHellish, sprHandMine, sprHandSeduction, sprHandVamp
+            amBazooka: DrawRotated(sprHandBazooka, hx, hy, hwSign(Gear^.dX), aangle);
+            amMortar: DrawRotated(sprHandMortar, hx, hy, hwSign(Gear^.dX), aangle);
             amMolotov: DrawRotated(sprHandMolotov, hx, hy, hwSign(Gear^.dX), aangle);
             amBallgun: DrawRotated(sprHandBallgun, hx, hy, hwSign(Gear^.dX), aangle);
             amDrill: DrawRotated(sprHandDrill, hx, hy, hwSign(Gear^.dX), aangle);
@@ -1190,18 +1191,29 @@
             amDEagle: DrawRotated(sprHandDEagle, hx, hy, hwSign(Gear^.dX), aangle);
             amSniperRifle: DrawRotatedF(sprSniperRifle, hx, hy, 0, hwSign(Gear^.dX), aangle);
             amBlowTorch: DrawRotated(sprHandBlowTorch, hx, hy, hwSign(Gear^.dX), aangle);
+            amCake: DrawRotated(sprHandCake, hx, hy, hwSign(Gear^.dX), aangle);
+            amGrenade: DrawRotated(sprHandGrenade, hx, hy, hwSign(Gear^.dX), aangle);
+            amWatermelon: DrawRotated(sprHandMelon, hx, hy, hwSign(Gear^.dX), aangle);
+            amSkip: DrawRotated(sprHandSkip, hx, hy, hwSign(Gear^.dX), aangle);
+            amClusterBomb: DrawRotated(sprHandCluster, hx, hy, hwSign(Gear^.dX), aangle);
+            amDynamite: DrawRotated(sprHandDynamite, hx, hy, hwSign(Gear^.dX), aangle);
+            amHellishBomb: DrawRotated(sprHandHellish, hx, hy, hwSign(Gear^.dX), aangle);
+            amMine: DrawRotated(sprHandMine, hx, hy, hwSign(Gear^.dX), aangle);
+            amSeduction: DrawRotated(sprHandSeduction, hx, hy, hwSign(Gear^.dX), aangle);
+            amVampiric: DrawRotated(sprHandVamp, hx, hy, hwSign(Gear^.dX), aangle);
             amRCPlane: begin
                 DrawRotated(sprHandPlane, hx, hy, hwSign(Gear^.dX), 0);
                 defaultPos:= false
                 end;
             amGirder: begin
+                DrawRotated(sprHandConstruction, hx, hy, hwSign(Gear^.dX), aangle);
                 DrawSpriteClipped(sprGirder,
                                   sx-256,
                                   sy-256,
                                   LongInt(topY)+WorldDy,
                                   LongInt(rightX)+WorldDx,
                                   cWaterLine+WorldDy,
-                                  LongInt(leftX)+WorldDx);
+                                  LongInt(leftX)+WorldDx)
                 end;
         end;
 
Binary file share/hedgewars/Data/Graphics/Hedgehog/amCake.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/amCluster.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/amConstruction.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/amDynamite.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/amGrenade.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/amHellish.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/amMelon.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/amMine.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/amMortar.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/amSeduction.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/amSkip.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/amVamp.png has changed
Binary file share/hedgewars/Data/Maps/cheese/map.png has changed