Some preparation work for attacking from rope, parachute and etc.
authorunc0rr
Mon, 12 May 2008 15:00:20 +0000
changeset 928 b9064b48b001
parent 927 2c1675344a6f
child 929 9456e1e77369
Some preparation work for attacking from rope, parachute and etc.
hedgewars.kdevelop
hedgewars/GSHandlers.inc
hedgewars/HHHandlers.inc
hedgewars/uConsts.pas
--- 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 @@
     <primarylanguage>C++</primarylanguage>
     <ignoreparts>
       <part>kdevfilegroups</part>
-      <part>kdevvalgrind</part>
       <part>kdevdoxygen</part>
       <part>kdevregexptest</part>
+      <part>kdevabbrev</part>
       <part>kdevdistpart</part>
       <part>kdevscripting</part>
       <part>kdevfilter</part>
+      <part>kdevastyle</part>
     </ignoreparts>
     <projectname>hedgewars</projectname>
     <projectdirectory>.</projectdirectory>
--- 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;
 
--- 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);
--- 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;