From 0774f6594b47870ea03bc91e9178cb9111f9230b Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sat, 26 Mar 2022 09:50:07 +0200
Subject: [PATCH] Set resources on player map (FoW map) when loading saved game

Reported by ddeanbrown

See osdn #44176

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>

----
Cherry-picked from Freeciv commit a53bc138c9bb27a59a919c3d8c2f01ba0b84ea05
---
 server/savegame/savegame3.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/server/savegame/savegame3.cpp b/server/savegame/savegame3.cpp
index 3ce118d284..a4733f58b2 100644
--- a/server/savegame/savegame3.cpp
+++ b/server/savegame/savegame3.cpp
@@ -6641,6 +6641,21 @@ static void sg_load_player_vision(struct loaddata *loading,
   }
   halfbyte_iterate_extras_end;
 
+  whole_map_iterate(&(wld.map), ptile)
+  {
+    struct player_tile *plrtile = map_get_player_tile(ptile, plr);
+
+    extra_type_by_cause_iterate(EC_RESOURCE, pres)
+    {
+      if (BV_ISSET(plrtile->extras, extra_number(pres))
+          && terrain_has_resource(plrtile->terrain, pres)) {
+        plrtile->resource = pres;
+      }
+    }
+    extra_type_by_cause_iterate_end;
+  }
+  whole_map_iterate_end;
+
   if (game.server.foggedborders) {
     // Load player map (border).
     int x, y;