Merge pull request #773 from cazfi/srvup

freeciv-web/src/main/webapp/javascript/fc_types.js

@@ -265,13 +265,14 @@ var ACTION_UNIT_MOVE3 = 110;
 var ACTION_TELEPORT = 111;
 var ACTION_TELEPORT2 = 112;
 var ACTION_TELEPORT3 = 113;
-var ACTION_CLEAN = 114;
-var ACTION_GAIN_VETERANCY = 115;
-var ACTION_USER_ACTION1 = 116;
-var ACTION_USER_ACTION2 = 117;
-var ACTION_USER_ACTION3 = 118;
-var ACTION_USER_ACTION4 = 119;
-var ACTION_COUNT = 120;
+var ACTION_TELEPORT_CONQUER=114;
+var ACTION_CLEAN = 115;
+var ACTION_GAIN_VETERANCY = 116;
+var ACTION_USER_ACTION1 = 117;
+var ACTION_USER_ACTION2 = 118;
+var ACTION_USER_ACTION3 = 119;
+var ACTION_USER_ACTION4 = 120;
+var ACTION_COUNT = 121;
 
 /* The action_decision enum */
 /* Doesn't need the player to decide what action to take. */

freeciv/apply_patches.sh

@@ -5,12 +5,6 @@
 # osdn #????? is ticket in freeciv.org tracker:
 # https://osdn.net/projects/freeciv/ticket/?????
 #
-# 0047-Meson-Turn-audio-option-to-a-combo.patch
-#   Rework disabling audio
-#   osdn #48757
-# 0047-Add-bv_match_dbv-utility-function.patch
-#   New bitvector utility function
-#   osdn #48771
 # 0057-Fix-bitvector-copy-functions.patch
 #   Fix to bitvector utility functions
 #   osdn #48772
@@ -63,8 +57,6 @@ declare -a GIT_PATCHLIST=(
 )
 
 declare -a PATCHLIST=(
-  "backports/0047-Meson-Turn-audio-option-to-a-combo"
-  "backports/0047-Add-bv_match_dbv-utility-function"
   "backports/0057-Fix-bitvector-copy-functions"
   "backports/0064-featured_text.-ch-Replace-NULL-with-nullptr"
   "backports/0050-Cache-territory-claiming-base-types"

freeciv/patches/freeciv-svn-webclient-changes.patch

@@ -1,7 +1,7 @@
-diff -Nurd -X.diff_ignore freeciv/common/featured_text.c freeciv/common/featured_text.c
---- freeciv/common/featured_text.c	2014-09-11 01:41:13.951730689 +0300
-+++ freeciv/common/featured_text.c	2014-09-11 01:41:34.947685408 +0300
-@@ -33,8 +33,8 @@
+diff -Nurd freeciv/common/featured_text.c freeciv/common/featured_text.c
+--- freeciv/common/featured_text.c	2023-11-01 00:21:32.242495319 +0200
++++ freeciv/common/featured_text.c	2023-11-01 00:21:42.682542714 +0200
+@@ -34,8 +34,8 @@
 
  #include "featured_text.h"
 
@@ -12,7 +12,7 @@ diff -Nurd -X.diff_ignore freeciv/common/featured_text.c freeciv/common/featured
  #define SEQ_END '/'
 
  #define MAX_LEN_STR 32
-@@ -141,7 +141,7 @@
+@@ -144,7 +144,7 @@
    case TTT_UNDERLINE:
      return "u";
    case TTT_COLOR:
@@ -21,7 +21,7 @@ diff -Nurd -X.diff_ignore freeciv/common/featured_text.c freeciv/common/featured
    case TTT_LINK:
      return "l";
    };
-@@ -238,7 +238,7 @@
+@@ -243,7 +243,7 @@
      {
        if (!find_option(sequence, "foreground", ptag->color.foreground,
                         sizeof(ptag->color.foreground))
@@ -30,7 +30,7 @@ diff -Nurd -X.diff_ignore freeciv/common/featured_text.c freeciv/common/featured
                            sizeof(ptag->color.foreground))) {
          ptag->color.foreground[0] = '\0';
        }
-@@ -482,7 +482,7 @@
+@@ -487,7 +487,7 @@
                                 text_tag_type_short_name(ptag->type));
 
        if (ptag->color.foreground[0] != '\0') {

freeciv/patches/webgl_vision_cheat_temporary.patch

@@ -1,6 +1,6 @@
 diff -Nurd freeciv/server/maphand.c freeciv/server/maphand.c
---- freeciv/server/maphand.c	2023-04-09 08:05:54.216224334 +0300
-+++ freeciv/server/maphand.c	2023-04-09 08:10:50.923088236 +0300
+--- freeciv/server/maphand.c	2023-10-31 23:58:21.251108170 +0200
++++ freeciv/server/maphand.c	2023-10-31 23:59:56.819663086 +0200
 @@ -461,7 +461,7 @@
        conn_list_do_buffer(dest);
      }
@@ -10,7 +10,7 @@ diff -Nurd freeciv/server/maphand.c freeciv/server/maphand.c
    } whole_map_iterate_end;
 
    conn_list_do_unbuffer(dest);
-@@ -594,20 +594,32 @@
+@@ -599,20 +599,32 @@
        }
 
        send_packet_tile_info(pconn, &info);
@@ -23,7 +23,7 @@ diff -Nurd freeciv/server/maphand.c freeciv/server/maphand.c
        info.worked = IDENTITY_NUMBER_ZERO;
 
 -      info.terrain = terrain_count();
-+      info.terrain = (NULL != tile_terrain(ptile))
++      info.terrain = (tile_terrain(ptile) != nullptr)
 +                      ? terrain_number(tile_terrain(ptile))
 +                      : terrain_count();
        info.resource = MAX_EXTRA_TYPES;

freeciv/version.txt

@@ -1,9 +1,9 @@
 # The Git SHA hash for the commit to checkout from
 # https://github.com/freeciv/freeciv
 
-FCREV=b6ef4dbba78789160555843f1b443d8c1bdd5eee
+FCREV=c2419fcc4db53f91aaacb0160aade827f12098ef
 
-ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2023.Sep.27"
+ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2023.Oct.02"
 
 # There's no need to bump this constantly as current freeciv-web
 # makes no connections to outside world - all connections are