[Freeciv-Dev] (PR#13330) [Patch] Allow city building air units

["Marko Lindqvist" <marko.lindqvist@xxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=13330 >


  Patch split from #12559


  - ML


diff -Nurd -X.diff_ignore freeciv/common/city.c freeciv/common/city.c
--- freeciv/common/city.c       2005-06-24 18:17:51.281250000 +0300
+++ freeciv/common/city.c       2005-06-25 13:30:32.546875000 +0300
@@ -732,16 +732,10 @@
     return FALSE;
   }
 
-  if (punit) {
-    enum unit_move_type move_type = unit_type(punit)->move_type;
-    Terrain_type_id t = ptile->terrain;
-
+  if (punit && !can_unit_exist_at_tile(punit, ptile)) {
     /* We allow land units to build land cities and sea units to build
-     * ocean cities. */
-    if ((move_type == LAND_MOVING && is_ocean(t))
-       || (move_type == SEA_MOVING && !is_ocean(t))) {
-      return FALSE;
-    }
+     * ocean cities. Air units can build cities anywhere. */
+    return FALSE;
   }
 
   /* game.info.min_dist_bw_cities minimum is 1, meaning adjacent is okay */
diff -Nurd -X.diff_ignore freeciv/doc/README.rulesets 
freeciv/doc/README.rulesets
--- freeciv/doc/README.rulesets 2005-06-24 18:18:14.765625000 +0300
+++ freeciv/doc/README.rulesets 2005-06-25 13:33:34.015625000 +0300
@@ -152,8 +152,6 @@
       - "Barbarian"
       - "BarbarianTech"
 
-    - Flag "Cities" does not work for move_type "Air" or "Heli" units
-
 nations.ruleset:
 
   Unused entries: