Author: cazfi
Date: Tue Dec 30 05:21:24 2014
New Revision: 27446

URL: http://svn.gna.org/viewcvs/freeciv?rev=27446&view=rev
Log:
Removed obsolete map.server.have_rivers_overlay

See patch #5607

Modified:
    trunk/common/map.c
    trunk/common/map.h
    trunk/server/savegame.c
    trunk/server/savegame2.c

Modified: trunk/common/map.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/map.c?rev=27446&r1=27445&r2=27446&view=diff
==============================================================================
--- trunk/common/map.c  (original)
+++ trunk/common/map.c  Tue Dec 30 05:21:24 2014
@@ -181,7 +181,6 @@
     map.server.alltemperate = MAP_DEFAULT_ALLTEMPERATE;
     map.server.temperature = MAP_DEFAULT_TEMPERATURE;
     map.server.have_resources = FALSE;
-    map.server.have_rivers_overlay = FALSE;
     map.server.have_huts = FALSE;
     map.server.team_placement = MAP_DEFAULT_TEAM_PLACEMENT;
   }

Modified: trunk/common/map.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/map.h?rev=27446&r1=27445&r2=27446&view=diff
==============================================================================
--- trunk/common/map.h  (original)
+++ trunk/common/map.h  Tue Dec 30 05:21:24 2014
@@ -105,7 +105,6 @@
       bool have_resources;
       bool ocean_resources;         /* Resources in the middle of the ocean */
       bool have_huts;
-      bool have_rivers_overlay;        /* only applies if !have_resources */
       enum team_placement team_placement;
     } server;
 

Modified: trunk/server/savegame.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame.c?rev=27446&r1=27445&r2=27446&view=diff
==============================================================================
--- trunk/server/savegame.c     (original)
+++ trunk/server/savegame.c     Tue Dec 30 05:21:24 2014
@@ -679,9 +679,6 @@
   /* used by set_savegame_special */
   load_river_overlay = TRUE;
 
-  /* Is it still as specials overlay after loading? */
-  map.server.have_rivers_overlay = (road_by_compat_special(ROCO_RIVER) == 
NULL);
-
   if (special_order) {
     special_halfbyte_iterate(j, num_special_types) {
       char buf[16]; /* enough for sprintf() below */

Modified: trunk/server/savegame2.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame2.c?rev=27446&r1=27445&r2=27446&view=diff
==============================================================================
--- trunk/server/savegame2.c    (original)
+++ trunk/server/savegame2.c    Tue Dec 30 05:21:24 2014
@@ -2473,14 +2473,7 @@
       sg_load_map_tiles_resources(loading);
     } else if (has_capability("riversoverlay", loading->secfile_options)) {
       /* Load only rivers overlay. */
-      struct road_type *priver;
-
       sg_load_map_tiles_specials(loading, TRUE);
-      priver = road_by_compat_special(ROCO_RIVER);
-      if (priver == NULL) {
-        /* They are still as river specials */
-        map.server.have_rivers_overlay = TRUE;
-      }
     }
 
     /* Nothing more needed for a scenario. */


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to