Merge pull request freeciv#292 from kvilhaugsvik/server_update

Server update
rrsc · Nov 18, 2019 · def7931 · def7931
2 parents 03cba61 + 74fc951
commit def7931
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/freeciv-web/src/main/webapp/javascript/packhand.js b/freeciv-web/src/main/webapp/javascript/packhand.js
@@ -1612,16 +1612,6 @@ function handle_timeout_info(packet)
   seconds_to_phasedone_sync = new Date().getTime();
 }
 
-/************************************************************************//**
-  Shows image with text and play music
-****************************************************************************/
-function handle_show_img_play_sound(packet)
-{
-  /* TODO: Implement */
-  /* Currently (6th Sep 2018) only used in sandbox. The sandbox ruleset
-   * isn't supported by Freeciv-web at the moment. */
-}
-
 function handle_play_music(packet)
 {
   /* TODO: Implement */

diff --git a/freeciv/patches/savegame.patch b/freeciv/patches/savegame.patch
@@ -31,7 +31,7 @@ index afbf376..db62262 100644
    }
 
 -  /* If orig_filename is NULL or empty, use a generated default name. */
--  if (filename[0] == '\0'){
+-  if (filename[0] == '\0') {
 -    /* manual save */
 -    generate_save_name(game.server.save_name, filename,
 -                       sizeof(stdata->filepath) + stdata->filepath - filename, "manual");

diff --git 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=1b9f4684bc9215fdec6313bbd57b0b8db89fa0aa
+FCREV=5c97588fe2b62d06ea9d119c867e01d994d8b7c0
 
-ORIGCAPSTR="+Freeciv.Devel-3.1-2019.Feb.28"
+ORIGCAPSTR="+Freeciv.Devel-3.1-2019.Jun.25"
 
 # There's no need to bump this constantly as current freeciv-web
 # makes no connections to outside world - all connections are