# HG changeset patch
# User unc0rr
# Date 1207415186 0
# Node ID 5687fa57a6c1f1c7c5eaa967aff6c8a4ed0ac343
# Parent 8f25b837d3187347cae812b0fae2281fa17271bc
- Use baseball-in-hand sprite
- Use pickhammer idle sprite
diff -r 8f25b837d318 -r 5687fa57a6c1 hedgewars.kdevelop
--- a/hedgewars.kdevelop Wed Apr 02 10:46:54 2008 +0000
+++ b/hedgewars.kdevelop Sat Apr 05 17:06:26 2008 +0000
@@ -18,20 +18,20 @@
hedgewars
.
false
-
+
kdevsubversion
-
+
executable
/
bin/hedgewars
-
+
false
true
-
+
/usr/home/unC0Rr/Sources/Hedgewars/Hedgewars-GNA
false
false
@@ -98,16 +98,16 @@
make
-
+
true
1
0
false
-
-
-
+
+
+
default
@@ -115,9 +115,9 @@
0
-
-
-
+
+
+
default
@@ -126,12 +126,12 @@
-
+
-
-
-
-
+
+
+
+
true
false
false
@@ -237,7 +237,7 @@
false
-
+
set
m_,_
theValue
@@ -256,7 +256,7 @@
false
-
+
true
false
@@ -269,13 +269,13 @@
-
-
-
+
+
+
-
+
/usr/home/unC0Rr/Sources/Hedgewars/Hedgewars-GNA/tags
diff -r 8f25b837d318 -r 5687fa57a6c1 hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas Wed Apr 02 10:46:54 2008 +0000
+++ b/hedgewars/uConsts.pas Sat Apr 05 17:06:26 2008 +0000
@@ -42,7 +42,7 @@
sprSwitch, sprParachute, sprTarget, sprRopeNode, sprConsoleBG,
sprQuestion, sprPowerBar, sprWindBar, sprWindL, sprWindR,
sprFlake, sprHandRope, sprHandBazooka, sprHandShotgun,
- sprHandDEagle, sprHandAirAttack);
+ sprHandDEagle, sprHandAirAttack, sprHandBaseball);
TGearType = (gtAmmo_Bomb, gtHedgehog, gtAmmo_Grenade, gtHealthTag,
gtGrave, gtUFO, gtShotgunShot, gtPickHammer, gtRope,
@@ -355,7 +355,9 @@
(FileName: 'amDEagle'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
Width: 32; Height: 32; saveSurf: false),// sprHandDEagle
(FileName:'amAirAttack'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
- Width: 32; Height: 32; saveSurf: false) // sprHandAirAttack
+ Width: 32; Height: 32; saveSurf: false),// sprHandAirAttack
+ (FileName: 'amBaseball'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+ Width: 32; Height: 32; saveSurf: false) // sprHandBaseball
);
Soundz: array[TSound] of record
diff -r 8f25b837d318 -r 5687fa57a6c1 hedgewars/uGears.pas
--- a/hedgewars/uGears.pas Wed Apr 02 10:46:54 2008 +0000
+++ b/hedgewars/uGears.pas Sat Apr 05 17:06:26 2008 +0000
@@ -528,18 +528,24 @@
amBazooka,
amRope,
amShotgun,
- amDEagle: begin
+ amDEagle,
+ amBaseballBat: begin
DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
hwSign(Gear^.dX),
0,
4,
0);
- defaultPos:= false
end;
amAirAttack,
amMineStrike: begin
DrawRotated(sprHandAirAttack, hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) + WorldDy, hwSign(Gear^.dX), 0);
- defaultPos:= false
+ end;
+ amPickHammer: begin
+ DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
+ hwSign(Gear^.dX),
+ 1,
+ 2,
+ 0);
end;
else
DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy,
@@ -547,8 +553,15 @@
0,
3,
0);
- defaultPos:= false
- end
+ end;
+
+ case amt of
+ amBaseballBat: DrawRotated(sprHandBaseball,
+ hwRound(Gear^.X) + 1 - 4 * hwSign(Gear^.dX) + WorldDx,
+ hwRound(Gear^.Y) + 6 + WorldDy, hwSign(Gear^.dX), aangle);
+ end;
+
+ defaultPos:= false
end
end;
diff -r 8f25b837d318 -r 5687fa57a6c1 share/hedgewars/Data/Graphics/Hedgehog.png
Binary file share/hedgewars/Data/Graphics/Hedgehog.png has changed
diff -r 8f25b837d318 -r 5687fa57a6c1 share/hedgewars/Data/Graphics/Hedgehog/amBaseball.png
Binary file share/hedgewars/Data/Graphics/Hedgehog/amBaseball.png has changed