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.
merge from default 0.9.20
authorunc0rr
Wed, 25 Dec 2013 00:56:44 +0400
branch0.9.20
changeset 9845 fa615abab6c2
parent 9843 7918943c0ff1 (current diff)
parent 9844 8f5b48525a03 (diff)
child 9854 6c4dbe67fd7d
merge from default
--- a/hedgewars/uAI.pas	Wed Dec 25 00:55:26 2013 +0400
+++ b/hedgewars/uAI.pas	Wed Dec 25 00:56:44 2013 +0400
@@ -251,7 +251,7 @@
     AddAction(Actions, aia_Weapon, Longword(amSkip), 100 + random(200), 0, 0);
 
 if ((CurrentHedgehog^.MultiShootAttacks = 0) or ((Ammoz[Me^.Hedgehog^.CurAmmoType].Ammo.Propz and ammoprop_NoMoveAfter) = 0))
-    and (GameFlags and gfArtillery = 0) then
+    and (GameFlags and gfArtillery = 0) and (cGravityf <> 0) then
     begin
     tmp:= random(2) + 1;
     Push(0, Actions, Me^, tmp);
--- a/hedgewars/uAIAmmoTests.pas	Wed Dec 25 00:55:26 2013 +0400
+++ b/hedgewars/uAIAmmoTests.pas	Wed Dec 25 00:56:44 2013 +0400
@@ -1047,7 +1047,7 @@
 begin
 ap.ExplR:= 0;
 ap.Time:= 0;
-if (Level > 3) then
+if (Level > 3) or (cGravityf = 0) then
     exit(BadTurn);
 
 ap.Angle:= 0;
hedgewars