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.
Requested a few times
authornemo
Fri, 16 Sep 2011 14:43:04 -0400
changeset 5935 c89d5065d956
parent 5933 97c240202986
child 5937 2de4fa7102bf
Requested a few times
hedgewars/GSHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/uGearsRender.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/GSHandlers.inc	Fri Sep 16 14:04:21 2011 -0400
+++ b/hedgewars/GSHandlers.inc	Fri Sep 16 14:43:04 2011 -0400
@@ -5102,7 +5102,7 @@
         begin
         if (HH^.Gear <> nil) and (HH^.Gear^.State and gstInvisible = 0) then
             begin
-	        AfterAttack;
+            AfterAttack;
             if Gear = CurAmmoGear then CurAmmoGear := nil;
             HideHog(HH)
             end
@@ -5119,7 +5119,20 @@
         end
     end;
 
-if (Gear^.Pos = 1) and (GameTicks and $1F = 0) and (Gear^.Power < 255) then inc(Gear^.Power);
+if (Gear^.Pos = 1) and (GameTicks and $1F = 0) and (Gear^.Power < 255) then 
+    begin
+    inc(Gear^.Power);
+    if (Gear^.Power = 172) and (Gear^.Hedgehog^.Gear <> nil) then
+        begin
+        with Gear^.Hedgehog^.Gear^ do
+            begin
+	    State:= State or gstAnimation;
+	    Tag:= 2;
+	    Timer:= 0;
+	    Pos:= 0
+            end
+        end
+    end;
 if (Gear^.Pos = 3) and (GameTicks and $1F = 0) and (Gear^.Power > 0) then dec(Gear^.Power);
 if (Gear^.Pos = 1) and (Gear^.Power = 255) and ((GameTicks mod 2000) = 1000) then Gear^.Pos:= 2;
 if (Gear^.Pos = 3) and (Gear^.Power = 0) then
--- a/hedgewars/uGearsRender.pas	Fri Sep 16 14:04:21 2011 -0400
+++ b/hedgewars/uGearsRender.pas	Fri Sep 16 14:43:04 2011 -0400
@@ -328,7 +328,7 @@
         hx:= ox + 8 * sign;
         hy:= oy - 2;
         aangle:= Gear^.Angle * 180 / cMaxAngle - 90;
-        if CurAmmoGear <> nil then
+        if (CurAmmoGear <> nil) and (CurAmmoGear^.Kind <> gtTardis) then
         begin
             case CurAmmoGear^.Kind of
                 gtShotgunShot: begin
hedgewars