From 4e461e7c2370b76f93eff980df63ab08913d6587 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 19 Oct 2024 04:26:23 +0300 Subject: [PATCH] Update to Freeciv server freeciv/freeciv@e43360ff51 Signed-off-by: Marko Lindqvist --- .../src/main/webapp/javascript/packhand.js | 5 ++ freeciv/apply_patches.sh | 4 -- ...orrect-loading-last-turn-change-time.patch | 47 ------------------- freeciv/patches/maphand_ch.patch | 20 ++++---- freeciv/version.txt | 4 +- 5 files changed, 17 insertions(+), 63 deletions(-) delete mode 100644 freeciv/patches/backports/0061-savegame-Correct-loading-last-turn-change-time.patch diff --git a/freeciv-web/src/main/webapp/javascript/packhand.js b/freeciv-web/src/main/webapp/javascript/packhand.js index 9998142ac..8db54ba9b 100644 --- a/freeciv-web/src/main/webapp/javascript/packhand.js +++ b/freeciv-web/src/main/webapp/javascript/packhand.js @@ -1959,3 +1959,8 @@ function handle_team_name_info(packet) { /* TODO: implement */ } + +function handle_popup_image(packet) +{ + /* TODO: implement */ +} diff --git a/freeciv/apply_patches.sh b/freeciv/apply_patches.sh index ff0a9a74e..27284b440 100755 --- a/freeciv/apply_patches.sh +++ b/freeciv/apply_patches.sh @@ -6,9 +6,6 @@ # https://osdn.net/projects/freeciv/ticket/????? # https://redmine.freeciv.org/issues/??? # -# 0061-savegame-Correct-loading-last-turn-change-time.patch -# Savegame loading fix -# RM #545 # 0073-savecompat-Fix-adding-ACTION_NONE-actions-for-units-.patch # Savegame loading fix # RM #577 @@ -62,7 +59,6 @@ declare -a GIT_PATCHLIST=( ) declare -a PATCHLIST=( - "backports/0061-savegame-Correct-loading-last-turn-change-time" "backports/0073-savecompat-Fix-adding-ACTION_NONE-actions-for-units-" "backports/0089-Meson-Make-fc_client_common-to-depend-on-verhdr" "backports/0080-savegame-Save-ACTION_NONE-as-1" diff --git a/freeciv/patches/backports/0061-savegame-Correct-loading-last-turn-change-time.patch b/freeciv/patches/backports/0061-savegame-Correct-loading-last-turn-change-time.patch deleted file mode 100644 index 260fb535e..000000000 --- a/freeciv/patches/backports/0061-savegame-Correct-loading-last-turn-change-time.patch +++ /dev/null @@ -1,47 +0,0 @@ -From bc38b9d85bc11632745a040edfd12bfe0954b160 Mon Sep 17 00:00:00 2001 -From: Marko Lindqvist -Date: Fri, 3 May 2024 23:34:48 +0300 -Subject: [PATCH 61/61] savegame: Correct loading last turn change time - -The value was erroneously rounded down to full seconds, -while it's stored with 1/100 second accuracy in the savegame. - -Reported by alain_bkr - -See RM #545 - -Signed-off-by: Marko Lindqvist ---- - server/savegame/savegame2.c | 2 +- - server/savegame/savegame3.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/server/savegame/savegame2.c b/server/savegame/savegame2.c -index f5bbd75fdf..ad319a2033 100644 ---- a/server/savegame/savegame2.c -+++ b/server/savegame/savegame2.c -@@ -1971,7 +1971,7 @@ static void sg_load_game(struct loaddata *loading) - = !secfile_lookup_bool_default(loading->file, TRUE, "game.save_players"); - - game.server.turn_change_time -- = secfile_lookup_int_default(loading->file, 0, "game.last_turn_change_time") / 100; -+ = secfile_lookup_int_default(loading->file, 0, "game.last_turn_change_time") / 100.0; - } - - /* ======================================================================= -diff --git a/server/savegame/savegame3.c b/server/savegame/savegame3.c -index 31a2ed11e0..f3d8fbed42 100644 ---- a/server/savegame/savegame3.c -+++ b/server/savegame/savegame3.c -@@ -2234,7 +2234,7 @@ static void sg_load_game(struct loaddata *loading) - = !secfile_lookup_bool_default(loading->file, TRUE, "game.save_players"); - - game.server.turn_change_time -- = secfile_lookup_int_default(loading->file, 0, "game.last_turn_change_time") / 100; -+ = secfile_lookup_int_default(loading->file, 0, "game.last_turn_change_time") / 100.0; - } - - /************************************************************************//** --- -2.43.0 - diff --git a/freeciv/patches/maphand_ch.patch b/freeciv/patches/maphand_ch.patch index 28e972824..9624e13c1 100644 --- a/freeciv/patches/maphand_ch.patch +++ b/freeciv/patches/maphand_ch.patch @@ -1,7 +1,7 @@ diff -Nurd freeciv/common/networking/packets.def freeciv/common/networking/packets.def ---- freeciv/common/networking/packets.def 2024-05-18 00:46:38.885812349 +0300 -+++ freeciv/common/networking/packets.def 2024-05-18 00:46:49.709919374 +0300 -@@ -2468,3 +2468,13 @@ +--- freeciv/common/networking/packets.def 2024-10-19 03:56:30.894145694 +0300 ++++ freeciv/common/networking/packets.def 2024-10-19 03:56:46.886308153 +0300 +@@ -2449,3 +2449,13 @@ TILE dest; UINT32 turns; end @@ -16,8 +16,8 @@ diff -Nurd freeciv/common/networking/packets.def freeciv/common/networking/packe + STRING message[MAX_LEN_MSG]; +end diff -Nurd freeciv/server/maphand.c freeciv/server/maphand.c ---- freeciv/server/maphand.c 2024-05-18 00:46:39.253815986 +0300 -+++ freeciv/server/maphand.c 2024-05-18 00:46:49.709919374 +0300 +--- freeciv/server/maphand.c 2024-10-19 03:56:31.434151179 +0300 ++++ freeciv/server/maphand.c 2024-10-19 03:58:42.987487980 +0300 @@ -16,6 +16,7 @@ #endif @@ -34,7 +34,7 @@ diff -Nurd freeciv/server/maphand.c freeciv/server/maphand.c #include "events.h" #include "game.h" #include "map.h" -@@ -2729,3 +2731,380 @@ +@@ -2744,3 +2746,380 @@ } } } @@ -374,11 +374,11 @@ diff -Nurd freeciv/server/maphand.c freeciv/server/maphand.c + if (unit_owner(punit) == pplayer) { + /* Show bribe cost for own units. */ + astr_add_line(str, _("Bribe cost: %d"), -+ unit_bribe_cost(punit, pplayer)); ++ unit_bribe_cost(punit, pplayer, nullptr)); + } else { + /* We can only give an (lower) boundary for units of other players. */ + astr_add_line(str, _("Estimated bribe cost: > %d"), -+ unit_bribe_cost(punit, pplayer)); ++ unit_bribe_cost(punit, pplayer, nullptr)); + } + + if ((nullptr == pplayer || owner == pplayer) @@ -416,8 +416,8 @@ diff -Nurd freeciv/server/maphand.c freeciv/server/maphand.c + astr_free(&str); +} diff -Nurd freeciv/server/maphand.h freeciv/server/maphand.h ---- freeciv/server/maphand.h 2024-05-18 00:46:39.253815986 +0300 -+++ freeciv/server/maphand.h 2024-05-18 00:46:49.709919374 +0300 +--- freeciv/server/maphand.h 2024-10-19 03:56:31.434151179 +0300 ++++ freeciv/server/maphand.h 2024-10-19 03:56:46.894308234 +0300 @@ -147,4 +147,7 @@ void tile_change_side_effects(struct tile *ptile, bool refresh_city) fc__attribute((nonnull (1))); diff --git a/freeciv/version.txt b/freeciv/version.txt index 9372b3429..163745654 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=e30c986c070fb8ac2c415e15300f44aa1a5ce20f +FCREV=e43360ff51aa3b1f213ccf029489f29fe619f66e -ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.May.13" +ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.May.17" # There's no need to bump this constantly as current freeciv-web # makes no connections to outside world - all connections are