# HG changeset patch
# User unc0rr
# Date 1210604420 0
# Node ID b9064b48b0013e54012dca0e6325f764cfba8b1f
# Parent 2c1675344a6f1dba7aae080c1c8a0a48113a60f0
Some preparation work for attacking from rope, parachute and etc.
diff -r 2c1675344a6f -r b9064b48b001 hedgewars.kdevelop
--- a/hedgewars.kdevelop Sun May 11 19:30:40 2008 +0000
+++ b/hedgewars.kdevelop Mon May 12 15:00:20 2008 +0000
@@ -8,12 +8,13 @@
C++
kdevfilegroups
- kdevvalgrind
kdevdoxygen
kdevregexptest
+ kdevabbrev
kdevdistpart
kdevscripting
kdevfilter
+ kdevastyle
hedgewars
.
diff -r 2c1675344a6f -r b9064b48b001 hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc Sun May 11 19:30:40 2008 +0000
+++ b/hedgewars/GSHandlers.inc Mon May 12 15:00:20 2008 +0000
@@ -585,6 +585,7 @@
DeleteMe;
exit
end;
+
Gear^.dX:= HHGear^.X - Gear^.X;
Gear^.dY:= HHGear^.Y - Gear^.Y;
diff -r 2c1675344a6f -r b9064b48b001 hedgewars/HHHandlers.inc
--- a/hedgewars/HHHandlers.inc Sun May 11 19:30:40 2008 +0000
+++ b/hedgewars/HHHandlers.inc Mon May 12 15:00:20 2008 +0000
@@ -24,7 +24,8 @@
with PHedgehog(Gear^.Hedgehog)^ do
begin
- if ((Gear^.State and (gstAttacking or gstAttacked)) <> 0) or (AttacksNum > 0)
+ if ((Gear^.State and (gstAttacking or gstAttacked)) <> 0)
+ or (AttacksNum > 0)
or ((Gear^.State and gstHHDriven) = 0) then exit;
Gear^.Message:= Gear^.Message and not (gm_LJump or gm_HJump or gm_Slot);
diff -r 2c1675344a6f -r b9064b48b001 hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas Sun May 11 19:30:40 2008 +0000
+++ b/hedgewars/uConsts.pas Mon May 12 15:00:20 2008 +0000
@@ -196,6 +196,7 @@
ammoprop_NoCrosshair = $00000040;
ammoprop_AttackingPut = $00000080;
ammoprop_DontHold = $00000100;
+ ammoprop_AltAttack = $00000200;
AMMO_INFINITE = High(LongWord);
EXPLAllDamageInRadius = $00000001;
@@ -566,7 +567,8 @@
NumberInCase: 3;
Ammo: (Propz: ammoprop_ForwMsgs or
ammoprop_AttackInMove or
- ammoprop_DontHold;
+ ammoprop_DontHold or
+ ammoprop_AltAttack;
Count: 5;
NumPerTurn: 0;
Timer: 0;
@@ -693,7 +695,8 @@
Ammo: (Propz: ammoprop_ForwMsgs or
ammoprop_AttackInMove or
ammoprop_NoCrosshair or
- ammoprop_DontHold;
+ ammoprop_DontHold or
+ ammoprop_AltAttack;
Count: 2;
NumPerTurn: 0;
Timer: 0;
@@ -839,7 +842,8 @@
maxAngle: 0;
isDamaging: true;
PosCount: 1;
- PosSprite: sprWater));
+ PosSprite: sprWater)
+ );
var CountTexz: array[1..9] of PTexture;