Mercurial Mercurial > sheepy-clone / 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.
Use ammo-in-hand sprites for desert eagle, shotgun and bazooka
authorunc0rr
Tue, 25 Mar 2008 16:07:23 +0000
changeset 823 90d651e75547
parent 822 2ae8fd8ef804
child 824 e632cc7caf3a
Use ammo-in-hand sprites for desert eagle, shotgun and bazooka
hedgewars/uConsts.pas file | annotate | diff | comparison | revisions
hedgewars/uGears.pas file | annotate | diff | comparison | revisions
share/hedgewars/Data/Graphics/Hedgehog/amBazooka.png file | annotate | diff | comparison | revisions
share/hedgewars/Data/Graphics/Hedgehog/amDEagle.png file | annotate | diff | comparison | revisions
share/hedgewars/Data/Graphics/Hedgehog/amShotgun.png file | annotate | diff | comparison | revisions 
--- a/hedgewars/uConsts.pas	Mon Mar 24 20:27:12 2008 +0000
+++ b/hedgewars/uConsts.pas	Tue Mar 25 16:07:23 2008 +0000
@@ -40,8 +40,9 @@
                    sprAMSlotKeys, sprAMSelection, sprFinger, sprAirBomb,
                    sprAirplane, sprAmAirplane, sprAmGirder, sprHHTelepMask,
                    sprSwitch, sprParachute, sprTarget, sprRopeNode, sprConsoleBG,
-                   sprQuestion, sprPowerBar, sprWindBar,
-                   sprWindL, sprWindR, sprFlake, sprHandRope);
+                   sprQuestion, sprPowerBar, sprWindBar, sprWindL, sprWindR,
+                   sprFlake, sprHandRope, sprHandBazooka, sprHandShotgun,
+                   sprHandDEagle);
 
      TGearType  = (gtAmmo_Bomb, gtHedgehog, gtAmmo_Grenade, gtHealthTag,
                    gtGrave, gtUFO, gtShotgunShot, gtPickHammer, gtRope,
@@ -346,7 +347,13 @@
                      (FileName:      'Flake'; Path:ptCurrTheme; AltPath: ptNone; Texture: nil; Surface: nil;
                       Width:  64; Height: 64; saveSurf: false),// sprFlake
                      (FileName:     'amRope'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
-                      Width:  32; Height: 32; saveSurf: false) // sprHandRope
+                      Width:  32; Height: 32; saveSurf: false),// sprHandRope
+                     (FileName:  'amBazooka'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+                      Width:  32; Height: 32; saveSurf: false),// sprHandBazooka
+                     (FileName:  'amShotgun'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+                      Width:  32; Height: 32; saveSurf: false),// sprHandShotgun
+                     (FileName:   'amDEagle'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+                      Width:  32; Height: 32; saveSurf: false) // sprHandDEagle
                      );
 
       Soundz: array[TSound] of record
@@ -514,7 +521,7 @@
                                    Slot: 7;
                                    TimeAfterTurn: 0;
                                    minAngle: 0;
-                                   maxAngle: cMaxAngle;// div 2;
+                                   maxAngle: cMaxAngle div 2;
                                    PosCount: 1;
                                    PosSprite: sprWater),
                                   (NameId: sidMine;
--- a/hedgewars/uGears.pas	Mon Mar 24 20:27:12 2008 +0000
+++ b/hedgewars/uGears.pas	Tue Mar 25 16:07:23 2008 +0000
@@ -499,11 +499,17 @@
 		hy:= hwRound(Gear^.Y) - 2 + WorldDy;
 		aangle:= Gear^.Angle * 180 / cMaxAngle - 90;
 		case amt of
+			amBazooka: DrawRotated(sprHandBazooka, hx, hy, hwSign(Gear^.dX), aangle);
 			amRope: DrawRotated(sprHandRope, hx, hy, hwSign(Gear^.dX), aangle);
+			amShotgun: DrawRotated(sprHandShotgun, hx, hy, hwSign(Gear^.dX), aangle);
+			amDEagle: DrawRotated(sprHandDEagle, hx, hy, hwSign(Gear^.dX), aangle);
 		else
 		end;
 		case amt of
-			amRope: DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
+			amBazooka,
+			amRope,
+			amShotgun,
+			amDEagle: DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
 						hwSign(Gear^.dX),
 						0,
 						4,
Binary file share/hedgewars/Data/Graphics/Hedgehog/amBazooka.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/amDEagle.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/amShotgun.png has changed
sheepy-clone