Skip to content

Commit

Permalink
Server: Backport 0027-worklist_item_postpone_req_vec-Add-break-for-VU…
Browse files Browse the repository at this point in the history
…T_PLA.patch

Signed-off-by: Marko Lindqvist <[email protected]>
  • Loading branch information
cazfi committed Dec 22, 2023
1 parent 16040e8 commit cd9ffc4
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 1 deletion.
6 changes: 5 additions & 1 deletion freeciv/apply_patches.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# ------------------------------------------------
# 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/??
#
# 0039-Improve-report.c-coding-style.patch
# Baseline for scorelog_filenames.patch
Expand All @@ -21,6 +21,9 @@
# 0029-Meson-Search-mwand-by-MagickWand-6.Q16HDRI.pc.patch
# MagickWand configure time fix on latest Debian/Ubuntu
# RM #32
# 0027-worklist_item_postpone_req_vec-Add-break-for-VUT_PLA.patch
# Build target postponing fix
# RM #72

# Not in the upstream Freeciv server
# ----------------------------------
Expand Down Expand Up @@ -48,6 +51,7 @@ declare -a PATCHLIST=(
"backports/0003-Reserve-space-for-terminating-NULL-on-astr_buffer"
"backports/0005-Meson-Define-SIZEOF_INT"
"backports/0029-Meson-Search-mwand-by-MagickWand-6.Q16HDRI.pc"
"backports/0027-worklist_item_postpone_req_vec-Add-break-for-VUT_PLA"
"meson_webperimental"
"metachange"
"text_fixes"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From 11971174cc3b27fe306b7fe6fa8d0e6a777f482f Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <[email protected]>
Date: Sun, 17 Dec 2023 09:35:28 +0200
Subject: [PATCH 27/28] worklist_item_postpone_req_vec(): Add break; for
VUT_PLAYER_FLAG case

See RM #72

Signed-off-by: Marko Lindqvist <[email protected]>
---
server/cityturn.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/server/cityturn.c b/server/cityturn.c
index bf8237d363..363eedd40a 100644
--- a/server/cityturn.c
+++ b/server/cityturn.c
@@ -1370,6 +1370,7 @@ static bool worklist_item_postpone_req_vec(struct universal *target,
script_server_signal_emit(signal_name, ptarget,
pcity, "have_player_flag");
}
+ break;
case VUT_PLAYER_STATE:
purge = TRUE;
break;
--
2.43.0

0 comments on commit cd9ffc4

Please sign in to comment.