Merge pull request #871 from cazfi/srvup

freeciv/apply_patches.sh

@@ -2,16 +2,10 @@
 
 # Freeciv server version upgrade notes (backports)
 # ------------------------------------------------
-# osdn #????? or RM #??? is a ticket in freeciv.org tracker:
+# osdn #????? or RM #???? is a ticket in freeciv.org tracker:
 # https://osdn.net/projects/freeciv/ticket/?????
-# https://redmine.freeciv.org/issues/???
+# https://redmine.freeciv.org/issues/????
 #
-# 0074-Meson-Make-fc_server-to-depend-on-verhdr.patch
-#   Build fix
-#   RM #682
-# 0077-city_freeze_workers_queue-Set-needs_arrange-for-citi.patch
-#   City status legality fix
-#   RM #661
 # 0068-AI-Remove-shared-vision-from-pending-war-target-once.patch
 #   AI assert fix
 #   RM #701
@@ -24,6 +18,9 @@
 # 0046-Fix-combat-veterancy-chance.patch
 #   Fix veterancy gaining
 #   RM #983
+# 0048-Make-action-selection-dialog-to-appear-on-airlift.patch
+#   Action list popup fix
+#   RM #1028
 
 # Not in the upstream Freeciv server
 # ----------------------------------
@@ -44,12 +41,11 @@ declare -a GIT_PATCHLIST=(
 )
 
 declare -a PATCHLIST=(
-  "backports/0074-Meson-Make-fc_server-to-depend-on-verhdr"
-  "backports/0077-city_freeze_workers_queue-Set-needs_arrange-for-citi"
   "backports/0068-AI-Remove-shared-vision-from-pending-war-target-once"
   "backports/0038-map_init_topology-Operate-on-any-map"
   "backports/0030-Tex-Initialize-map-topology"
   "backports/0046-Fix-combat-veterancy-chance"
+  "backports/0048-Make-action-selection-dialog-to-appear-on-airlift"
   "RevertAmplio2ExtraUnits"
   "meson_webperimental"
   "metachange"

freeciv/patches/backports/0048-Make-action-selection-dialog-to-appear-on-airlift.patch

@@ -0,0 +1,53 @@
+From ebfe8b397bea164ea772432304d819f1285afe35 Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist <[email protected]>
+Date: Tue, 29 Oct 2024 04:57:49 +0200
+Subject: [PATCH 48/52] Make action selection dialog to appear on airlift
+
+Reported by Helge
+
+See RM #1028
+
+Signed-off-by: Marko Lindqvist <[email protected]>
+---
+ server/unittools.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/server/unittools.c b/server/unittools.c
+index a7977f05e1..768e11353a 100644
+--- a/server/unittools.c
++++ b/server/unittools.c
+@@ -4142,15 +4142,6 @@ bool unit_move(struct unit *punit, struct tile *pdesttile, int move_cost,
+   punit->action_decision_tile = NULL;
+   punit->action_decision_want = ACT_DEC_NOTHING;
+
+-  if (!adj && action_tgt_city(punit, pdesttile, FALSE)) {
+-    /* The unit can perform an action to the city at the destination tile.
+-     * A long distance move (like an airlift) doesn't ask what action to
+-     * perform before moving. Ask now. */
+-
+-    punit->action_decision_want = ACT_DEC_PASSIVE;
+-    punit->action_decision_tile = pdesttile;
+-  }
+-
+   /* Claim ownership of fortress? */
+   if (conquer_extras_allowed
+       && tile_has_claimable_base(pdesttile, unit_type_get(punit))) {
+@@ -4187,6 +4178,15 @@ bool unit_move(struct unit *punit, struct tile *pdesttile, int move_cost,
+     }
+   }
+
++  if (!adj && action_tgt_city(punit, pdesttile, FALSE)) {
++    /* The unit can perform an action to the city at the destination tile.
++     * A long distance move (like an airlift) doesn't ask what action to
++     * perform before moving. Ask now. */
++
++    punit->action_decision_want = ACT_DEC_PASSIVE;
++    punit->action_decision_tile = pdesttile;
++  }
++
+   /* Notifications of the move to the clients. */
+   if (adj) {
+     /* Special case: 'punit' is moving to adjacent position. Then we show
+-- 
+2.45.2
+

freeciv/version.txt

@@ -1,9 +1,9 @@
 # The Git SHA hash for the commit to checkout from
 # https://github.com/freeciv/freeciv
 
-FCREV=86394b498f81c04248b1c08225033f329a6593e5
+FCREV=c1c9cad310fc81c7e3a5d6880464d6cd6a56f0e6
 
-ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.June.04"
+ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.June.04h"
 
 # There's no need to bump this constantly as current freeciv-web
 # makes no connections to outside world - all connections are