# HG changeset patch
# User unc0rr
# Date 1387918604 -14400
# Node ID fa615abab6c28caa0a8f6171372ac9abc21011de
# Parent  7918943c0ff1c5a75828c247b706ccd3d62bf97a# Parent  8f5b48525a03f9a70af935366ee17fd140ab5972
merge from default

diff -r 7918943c0ff1 -r fa615abab6c2 hedgewars/uAI.pas
--- 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);
diff -r 7918943c0ff1 -r fa615abab6c2 hedgewars/uAIAmmoTests.pas
--- 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;