Mercurial Mercurial > hedgewars-draft / 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 sprite for pickhammer
authorunc0rr
Sun, 13 Apr 2008 16:14:13 +0000
changeset 845 ca72cf446ec2
parent 844 9a82149409f3
child 846 08c3f0bc766c
Add sprite for pickhammer
hedgewars/GSHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/uConsts.pas file | annotate | diff | comparison | revisions
hedgewars/uGears.pas file | annotate | diff | comparison | revisions
share/hedgewars/Data/Graphics/Hammer.png file | annotate | diff | comparison | revisions 
--- a/hedgewars/GSHandlers.inc	Sun Apr 13 14:06:17 2008 +0000
+++ b/hedgewars/GSHandlers.inc	Sun Apr 13 16:14:13 2008 +0000
@@ -398,7 +398,7 @@
    AfterAttack;
    exit
    end;
-   
+
 if (Gear^.Timer mod 33) = 0 then
    doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y) + 6, 6, EXPLDontDraw);
 
--- a/hedgewars/uConsts.pas	Sun Apr 13 14:06:17 2008 +0000
+++ b/hedgewars/uConsts.pas	Sun Apr 13 16:14:13 2008 +0000
@@ -42,7 +42,7 @@
                    sprSwitch, sprParachute, sprTarget, sprRopeNode, sprConsoleBG,
                    sprQuestion, sprPowerBar, sprWindBar, sprWindL, sprWindR,
                    sprFlake, sprHandRope, sprHandBazooka, sprHandShotgun,
-                   sprHandDEagle, sprHandAirAttack, sprHandBaseball);
+                   sprHandDEagle, sprHandAirAttack, sprHandBaseball, sprPHammer);
 
      TGearType  = (gtAmmo_Bomb, gtHedgehog, gtAmmo_Grenade, gtHealthTag,
                    gtGrave, gtUFO, gtShotgunShot, gtPickHammer, gtRope,
@@ -357,7 +357,9 @@
                      (FileName:'amAirAttack'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
                       Width:  32; Height: 32; saveSurf: false),// sprHandAirAttack
                      (FileName: 'amBaseball'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
-                      Width:  32; Height: 32; saveSurf: false) // sprHandBaseball
+                      Width:  32; Height: 32; saveSurf: false),// sprHandBaseball
+                     (FileName:     'Hammer'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+                      Width:  32; Height: 64; saveSurf: false) // sprPHammer
                      );
 
       Soundz: array[TSound] of record
--- a/hedgewars/uGears.pas	Sun Apr 13 14:06:17 2008 +0000
+++ b/hedgewars/uGears.pas	Sun Apr 13 16:14:13 2008 +0000
@@ -490,6 +490,8 @@
 					DxDy2Angle(CurAmmoGear^.dY, CurAmmoGear^.dX) - 110);
 			defaultPos:= false
 			end
+		else if (CurAmmoGear^.Kind = gtPickHammer) then
+			defaultPos:= false
 	end else
 	if ((Gear^.State and gstHHJumping) <> 0) then
 		begin
@@ -565,7 +567,7 @@
 	end
 end;
 
-if defaultPos then 
+if defaultPos then
 	DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
 		hwSign(Gear^.dX),
 		0,
@@ -692,6 +694,7 @@
      gtSmallDamage: if Gear^.Tex <> nil then DrawCentered(hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, Gear^.Tex);
            gtGrave: DrawSurfSprite(hwRound(Gear^.X) + WorldDx - 16, hwRound(Gear^.Y) + WorldDy - 16, 32, (GameTicks shr 7) and 7, PHedgehog(Gear^.Hedgehog)^.Team^.GraveTex);
              gtUFO: DrawSprite(sprUFO, hwRound(Gear^.X) - 16 + WorldDx, hwRound(Gear^.Y) - 16 + WorldDy, (GameTicks shr 7) mod 4);
+      gtPickHammer: DrawSprite(sprPHammer, hwRound(Gear^.X) - 16 +  WorldDx, hwRound(Gear^.Y) - 50 + ((GameTicks shr 5) and 1) * 2 + WorldDy, 0);
             gtRope: begin
                     roplen:= 0;
                     if RopePoints.Count > 0 then
Binary file share/hedgewars/Data/Graphics/Hammer.png has changed
hedgewars-draft