# HG changeset patch
# User nemo
# Date 1387922417 18000
# Node ID d19a8831d46a565861ce4d9cc6bc22bc54073fe9
# Parent  7918943c0ff1c5a75828c247b706ccd3d62bf97a# Parent  4dc7cb571e1ddb14850439eb5f2d121b0ce0b602
pick up trunk changes (AI, encoding)

diff -r 7918943c0ff1 -r d19a8831d46a QTfrontend/ui/page/pagemain.cpp
--- a/QTfrontend/ui/page/pagemain.cpp	Wed Dec 25 00:55:26 2013 +0400
+++ b/QTfrontend/ui/page/pagemain.cpp	Tue Dec 24 17:00:17 2013 -0500
@@ -183,6 +183,7 @@
         QFile file(tipFile);
         file.open(QIODevice::ReadOnly);
         QTextStream in(&file);
+        in.setCodec("UTF-8");
         QString line = in.readLine();
         int tip_platform = 0;
         while (!line.isNull()) {
diff -r 7918943c0ff1 -r d19a8831d46a hedgewars/uAI.pas
--- a/hedgewars/uAI.pas	Wed Dec 25 00:55:26 2013 +0400
+++ b/hedgewars/uAI.pas	Tue Dec 24 17:00:17 2013 -0500
@@ -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 d19a8831d46a hedgewars/uAIAmmoTests.pas
--- a/hedgewars/uAIAmmoTests.pas	Wed Dec 25 00:55:26 2013 +0400
+++ b/hedgewars/uAIAmmoTests.pas	Tue Dec 24 17:00:17 2013 -0500
@@ -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;