Update to Freeciv server version 27049.

codesorc · Nov 17, 2014 · 507bac2 · 507bac2
1 parent 61a8d00
commit 507bac2
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 82 deletions.
diff --git a/freeciv-web/src/main/webapp/javascript/packhand.js b/freeciv-web/src/main/webapp/javascript/packhand.js
@@ -1001,3 +1001,8 @@ function handle_worker_task(packet)
 {
   /* TODO: Implement */
 }
+
+function handle_timeout_info(packet)
+{
+  /* TODO: Implement */
+}
diff --git a/freeciv/apply_patches.sh b/freeciv/apply_patches.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 
-# RetireSafe         - Backported bug #22950
-# AbortRecursiveBase - Backported bug #22949
 
-PATCHLIST="freeciv_web_all_packets_def_changes caravan_fixes1 city_fixes city_impr_fix2 city_name_bugfix city-naming-change city_fixes2 citytools_changes goto_1 goto_attack1 goto_fix_1 goto_fix_2 govt-fix map-settings metachange orders_aborted orders_invalid2 text_fixes unithand-change2 webclient-ai-attitude current_research_cost freeciv-svn-webclient-changes network-rewrite-1 fcnet_packets misc_devversion_sync scenario_ruleset savegame savegame2 maphand_ch serverside_extra_assign libtoolize_no_symlinks spacerace city_disbandable ai_traits_crash unittools ruleset-capability worklists server_password disable_nls RetireSafe AbortRecursiveBase aifill"
+PATCHLIST="freeciv_web_all_packets_def_changes caravan_fixes1 city_fixes city_impr_fix2 city_name_bugfix city-naming-change city_fixes2 citytools_changes goto_1 goto_attack1 goto_fix_1 goto_fix_2 govt-fix map-settings metachange orders_aborted orders_invalid2 text_fixes unithand-change2 webclient-ai-attitude current_research_cost freeciv-svn-webclient-changes network-rewrite-1 fcnet_packets misc_devversion_sync scenario_ruleset savegame savegame2 maphand_ch serverside_extra_assign libtoolize_no_symlinks spacerace city_disbandable ai_traits_crash unittools ruleset-capability worklists server_password aifill"
 
 apply_patch() {
   echo "*** Applying $1.patch ***"

diff --git a/freeciv/patches/AbortRecursiveBase.patch b/freeciv/patches/AbortRecursiveBase.patch
diff --git a/freeciv/patches/RetireSafe.patch b/freeciv/patches/RetireSafe.patch
diff --git a/freeciv/patches/disable_nls.patch b/freeciv/patches/disable_nls.patch
diff --git a/freeciv/patches/freeciv_web_all_packets_def_changes.patch b/freeciv/patches/freeciv_web_all_packets_def_changes.patch
@@ -81,22 +81,22 @@ diff -Nurd -X.diff_ignore freeciv/common/packets.def freeciv/common/packets.def
    AIRLIFTING_STYLE airlifting_style;
    UINT8 angrycitizen;
    SINT16 base_pollution;
-@@ -505,7 +506,7 @@
-   BOOL restrictinfra;
-   BOOL unreachable_protects;
-   UINT32 sciencebox;
--  SFLOAT10x3 seconds_to_phasedone;
-+  UINT32 seconds_to_phasedone;
-   UINT32 shieldbox;
-   UINT32 skill_level;
-   BOOL slow_invasions;
 @@ -533,6 +534,7 @@
    STRING calendar_fragment_name[MAX_CALENDAR_FRAGMENTS][MAX_LEN_NAME];
    BOOL civil_war_enabled;
    BOOL paradrop_to_transport;
 +  STRING meta_message[MAX_LEN_NAME];
  end
 
+ PACKET_MAP_INFO = 17; sc, lsend
+@@ -535,7 +535,7 @@ end
+ # This cannot have is-info set. Sending the same value a second time after a
+ # while has passed means a completely reset timeout.
+ PACKET_TIMEOUT_INFO = 244; sc
+-  SFLOAT10x3 seconds_to_phasedone;
++  UINT32 seconds_to_phasedone;
+ end
+
  PACKET_MAP_INFO = 17; sc, lsend
 @@ -611,6 +613,9 @@
    SINT16 citizen_base[O_LAST];

diff --git a/freeciv/version.txt b/freeciv/version.txt
@@ -1,7 +1,7 @@
-FCREV=27035
+FCREV=27049
 FCBRANCH=trunk
 
-ORIGCAPSTR="+Freeciv.Devel-2.6-2014.Nov.06"
+ORIGCAPSTR="+Freeciv.Devel-2.6-2014.Nov.13"
 
 # There's no need to bump this constantly as current freeciv-web
 # makes no connections to outside world - all connections are