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.
Use blowtorch sprites
authorunc0rr
Thu, 17 Apr 2008 16:21:44 +0000
changeset 847 66970c0ed3aa
parent 846 08c3f0bc766c
child 848 b31b72756927
Use blowtorch sprites
hedgewars/uConsts.pas file | annotate | diff | comparison | revisions
hedgewars/uGears.pas file | annotate | diff | comparison | revisions
share/hedgewars/Data/Graphics/Hedgehog.png file | annotate | diff | comparison | revisions
share/hedgewars/Data/Graphics/Hedgehog/amBTorch_i.png file | annotate | diff | comparison | revisions
share/hedgewars/Data/Graphics/Hedgehog/amBTorch_w.png file | annotate | diff | comparison | revisions 
--- a/hedgewars/uConsts.pas	Tue Apr 15 16:13:24 2008 +0000
+++ b/hedgewars/uConsts.pas	Thu Apr 17 16:21:44 2008 +0000
@@ -42,7 +42,8 @@
                    sprSwitch, sprParachute, sprTarget, sprRopeNode, sprConsoleBG,
                    sprQuestion, sprPowerBar, sprWindBar, sprWindL, sprWindR,
                    sprFlake, sprHandRope, sprHandBazooka, sprHandShotgun,
-                   sprHandDEagle, sprHandAirAttack, sprHandBaseball, sprPHammer);
+                   sprHandDEagle, sprHandAirAttack, sprHandBaseball, sprPHammer,
+                   sprHandBlowTorch, sprBlowTorch);
 
      TGearType  = (gtAmmo_Bomb, gtHedgehog, gtAmmo_Grenade, gtHealthTag,
                    gtGrave, gtUFO, gtShotgunShot, gtPickHammer, gtRope,
@@ -359,7 +360,11 @@
                      (FileName: 'amBaseball'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
                       Width:  32; Height: 32; saveSurf: false),// sprHandBaseball
                      (FileName:     'Hammer'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
-                      Width:  32; Height: 64; saveSurf: false) // sprPHammer
+                      Width:  32; Height: 64; saveSurf: false),// sprPHammer
+                     (FileName: 'amBTorch_i'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+                      Width:  32; Height: 32; saveSurf: false),// sprHandBlowToch
+                     (FileName: 'amBTorch_w'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+                      Width:  32; Height: 32; saveSurf: false) // sprBlowToch
                      );
 
       Soundz: array[TSound] of record
--- a/hedgewars/uGears.pas	Tue Apr 15 16:13:24 2008 +0000
+++ b/hedgewars/uGears.pas	Thu Apr 17 16:21:44 2008 +0000
@@ -477,21 +477,36 @@
 	defaultPos: boolean;
 begin
 defaultPos:= true;
+
+hx:= hwRound(Gear^.X) + 1 + 8 * hwSign(Gear^.dX) + WorldDx;
+hy:= hwRound(Gear^.Y) - 2 + WorldDy;
+aangle:= Gear^.Angle * 180 / cMaxAngle - 90;
+
 if (Gear^.State and gstHHDriven) <> 0 then
 begin
 	if CurAmmoGear <> nil then
 	begin
-		if (CurAmmoGear^.Kind = gtRope) then
-			begin
-			DrawHedgehog(hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy,
-					1,
-					1,
-					0,
-					DxDy2Angle(CurAmmoGear^.dY, CurAmmoGear^.dX) - 110);
-			defaultPos:= false
-			end
+		case CurAmmoGear^.Kind of
+			 gtRope: begin
+				DrawHedgehog(hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy,
+						1,
+						1,
+						0,
+						DxDy2Angle(CurAmmoGear^.dY, CurAmmoGear^.dX) - 110);
+				defaultPos:= false
+				end;
+			gtBlowTorch: begin
+				DrawRotated(sprBlowTorch, hx, hy, hwSign(Gear^.dX), aangle);
+				DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
+						hwSign(Gear^.dX),
+						1,
+						3,
+						0);
+				end;
+
 		else if (CurAmmoGear^.Kind = gtPickHammer) then
 			defaultPos:= false
+		end
 	end else
 	if ((Gear^.State and gstHHJumping) <> 0) then
 		begin
@@ -515,15 +530,12 @@
     else
 	begin
 		amt:= CurrentHedgehog^.Ammo^[CurrentHedgehog^.CurSlot, CurrentHedgehog^.CurAmmo].AmmoType;
-		hx:= hwRound(Gear^.X) + 1 + 8 * hwSign(Gear^.dX) + WorldDx;
-		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);
+			amBlowTorch: DrawRotated(sprHandBlowTorch, hx, hy, hwSign(Gear^.dX), aangle);
 		end;
 
 		case amt of
@@ -531,29 +543,28 @@
 			amRope,
 			amShotgun,
 			amDEagle,
-			amBaseballBat: begin
-				DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
+			amBaseballBat: DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
 						hwSign(Gear^.dX),
 						0,
 						4,
 						0);
-				end;
 			amAirAttack,
-			amMineStrike: begin
-				DrawRotated(sprHandAirAttack, hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) + WorldDy, hwSign(Gear^.dX), 0);
-				end;
-			amPickHammer: begin
-				DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
+			amMineStrike: DrawRotated(sprHandAirAttack, hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) + WorldDy, hwSign(Gear^.dX), 0);
+			amPickHammer: DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
 						hwSign(Gear^.dX),
 						1,
 						2,
 						0);
-				end;
+			amBlowTorch: DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
+						hwSign(Gear^.dX),
+						1,
+						3,
+						0);
 		else
 			DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
 				hwSign(Gear^.dX),
 				0,
-				3,
+				4,
 				0);
 		end;
 
Binary file share/hedgewars/Data/Graphics/Hedgehog.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/amBTorch_i.png has changed
Binary file share/hedgewars/Data/Graphics/Hedgehog/amBTorch_w.png has changed
hedgewars