Obsolete orchard and dairy without a suffix _north

CleverRaven · Jul 17, 2019 · 27882ae · 27882ae
1 parent 96d7340
commit 27882ae
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/data/json/obsolete_terrains.json b/data/json/obsolete_terrains.json
@@ -257,7 +257,14 @@
       "shipwreck_river_2",
       "shipwreck_river_3",
       "shipwreck_river_4",
-      "toxic_dump"
+      "toxic_dump",
+      "orchard_tree_apple",
+      "orchard_stall",
+      "orchard_processing",
+      "dairy_farm_NW",
+      "dairy_farm_NE",
+      "dairy_farm_SW",
+      "dairy_farm_SE"
     ]
   }
 ]
diff --git a/src/savegame.cpp b/src/savegame.cpp
@@ -753,7 +753,14 @@ void overmap::convert_terrain( const std::unordered_map<tripoint, std::string> &
                    old == "pwr_sub_s" ||
                    old == "radio_tower" ||
                    old == "sai" ||
-                   old == "toxic_dump" ) {
+                   old == "toxic_dump" ||
+                   old == "orchard_stall" ||
+                   old == "orchard_tree_apple" ||
+                   old == "orchard_processing" ||
+                   old == "dairy_farm_NW" ||
+                   old == "dairy_farm_NE" ||
+                   old == "dairy_farm_SW" ||
+                   old == "dairy_farm_SE" ) {
             new_id = oter_id( old + "_north" );
         }