diff --git a/freeciv/apply_patches.sh b/freeciv/apply_patches.sh index cee81512a..e88de38b2 100755 --- a/freeciv/apply_patches.sh +++ b/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" diff --git a/freeciv/patches/backports/0048-Make-action-selection-dialog-to-appear-on-airlift.patch b/freeciv/patches/backports/0048-Make-action-selection-dialog-to-appear-on-airlift.patch new file mode 100644 index 000000000..cfca18125 --- /dev/null +++ b/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 +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 +--- + 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 + diff --git a/freeciv/patches/backports/0074-Meson-Make-fc_server-to-depend-on-verhdr.patch b/freeciv/patches/backports/0074-Meson-Make-fc_server-to-depend-on-verhdr.patch deleted file mode 100644 index dcbac934b..000000000 --- a/freeciv/patches/backports/0074-Meson-Make-fc_server-to-depend-on-verhdr.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6228415a558a8adf6f715abe2d91ed2fd145b79a Mon Sep 17 00:00:00 2001 -From: Marko Lindqvist -Date: Tue, 28 May 2024 00:11:05 +0300 -Subject: [PATCH 74/74] Meson: Make fc_server to depend on verhdr - -See RM #682 - -Signed-off-by: Marko Lindqvist ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 5938236ee7..7a3f0288e8 100644 ---- a/meson.build -+++ b/meson.build -@@ -1503,7 +1503,7 @@ server_lib = static_library('fc_server', - 'server/unittools.c', - 'server/voting.c', - include_directories: server_inc, -- sources: [ pack_server, -+ sources: [ verhdr, pack_server, - tolua.process('server/scripting/tolua_fcdb.pkg', - 'server/scripting/tolua_server.pkg')], - dependencies: lua_dep --- -2.43.0 - diff --git a/freeciv/patches/backports/0077-city_freeze_workers_queue-Set-needs_arrange-for-citi.patch b/freeciv/patches/backports/0077-city_freeze_workers_queue-Set-needs_arrange-for-citi.patch deleted file mode 100644 index 857d1afd7..000000000 --- a/freeciv/patches/backports/0077-city_freeze_workers_queue-Set-needs_arrange-for-citi.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2af5f7de98ee8d5dcfe9dae9b524ceaa817a79b8 Mon Sep 17 00:00:00 2001 -From: Marko Lindqvist -Date: Wed, 22 May 2024 15:12:31 +0300 -Subject: [PATCH 77/77] city_freeze_workers_queue(): Set needs_arrange for - cities already in queue - -See RM #661 - -Signed-off-by: Marko Lindqvist ---- - server/citytools.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/server/citytools.c b/server/citytools.c -index d9332656e7..b687c07b74 100644 ---- a/server/citytools.c -+++ b/server/citytools.c -@@ -162,6 +162,11 @@ void city_freeze_workers_queue(struct city *pcity) - if (arrange_workers_queue == nullptr) { - arrange_workers_queue = city_list_new(); - } else if (city_list_find_number(arrange_workers_queue, pcity->id)) { -+ /* City might have been arranged since it was originally put to the queue. -+ * Make sure needs_arrange is set again. */ -+ if (pcity->server.needs_arrange == CNA_NOT) { -+ pcity->server.needs_arrange = CNA_NORMAL; -+ } - return; - } - --- -2.43.0 - diff --git a/freeciv/version.txt b/freeciv/version.txt index 3988599b1..471177041 100644 --- a/freeciv/version.txt +++ b/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