Merge pull request #822 from cazfi/srvup

freeciv · Mar 24, 2024 · 08082d7 · 08082d7
2 parents db1a5e5 + 5c4adbc
commit 08082d7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/freeciv/patches/endgame-mapimg.patch b/freeciv/patches/endgame-mapimg.patch
@@ -1,6 +1,6 @@
 diff -Nurd freeciv/common/mapimg.c freeciv/common/mapimg.c
---- freeciv/common/mapimg.c	2023-11-11 19:44:44.097907846 +0200
-+++ freeciv/common/mapimg.c	2023-11-11 19:44:55.149923531 +0200
+--- freeciv/common/mapimg.c	2024-03-17 11:10:03.414047235 +0200
++++ freeciv/common/mapimg.c	2024-03-17 11:11:22.498437035 +0200
 @@ -1379,13 +1379,11 @@
    case SHOW_NONE:    /* no player one the map */
    case SHOW_ALL:     /* show all players in one map */
@@ -9,17 +9,17 @@ diff -Nurd freeciv/common/mapimg.c freeciv/common/mapimg.c
 -                       mapimg_generate_name(pmapdef));
 
      pimg = img_new(pmapdef, CURRENT_TOPOLOGY, CURRENT_WRAP,
-                    wld.map.xsize, wld.map.ysize);
+                    MAP_NATIVE_WIDTH, MAP_NATIVE_HEIGHT);
      img_createmap(pimg);
 -    if (!img_save(pimg, mapimgfile, path)) {
 +    if (!img_save(pimg, savename, path)) {
        ret = FALSE;
      }
      img_destroy(pimg);
 diff -Nurd freeciv/server/srv_main.c freeciv/server/srv_main.c
---- freeciv/server/srv_main.c	2023-11-11 19:44:44.585908538 +0200
-+++ freeciv/server/srv_main.c	2023-11-11 19:44:55.149923531 +0200
-@@ -3850,7 +3850,11 @@
+--- freeciv/server/srv_main.c	2024-03-17 11:10:03.746048919 +0200
++++ freeciv/server/srv_main.c	2024-03-17 11:10:12.330092302 +0200
+@@ -3857,7 +3857,11 @@
      struct mapdef *pmapdef = mapimg_isvalid(i);
 
      if (pmapdef != NULL) {

diff --git a/freeciv/patches/webgl_vision_cheat_temporary.patch b/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-10-31 23:58:21.251108170 +0200
-+++ freeciv/server/maphand.c	2023-10-31 23:59:56.819663086 +0200
+--- freeciv/server/maphand.c	2024-03-17 11:41:42.049729184 +0200
++++ freeciv/server/maphand.c	2024-03-17 11:41:51.409766779 +0200
 @@ -461,7 +461,7 @@
        conn_list_do_buffer(dest);
      }
@@ -10,8 +10,8 @@ diff -Nurd freeciv/server/maphand.c freeciv/server/maphand.c
    } whole_map_iterate_end;
 
    conn_list_do_unbuffer(dest);
-@@ -599,20 +599,32 @@
-       }
+@@ -603,20 +603,32 @@
+       info.altitude = ptile->altitude;
 
        send_packet_tile_info(pconn, &info);
 -    } else if (send_unknown) {
@@ -44,4 +44,4 @@ diff -Nurd freeciv/server/maphand.c freeciv/server/maphand.c
 +
        info.label[0] = '\0';
 
-       send_packet_tile_info(pconn, &info);
+       info.altitude = 0;
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=32144618d616cd7dabb191cb7c05f2bc83ab69d9
+FCREV=6ebfac2ab44c29511a016f5866c95f286bbcb849
 
-ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Jan.26"
+ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Feb.01"
 
 # There's no need to bump this constantly as current freeciv-web
 # makes no connections to outside world - all connections are