Trees and other permanent objects regrowing destroy sections of under…

…lying roads in natural reclamation. However, surface non-permanent natural objects (stones, iron, etc.) will re-occur on top of the road. Fixes #334
jasonrohrer · Jun 13, 2019 · 3ec4722 · 3ec4722
1 parent 836aea6
commit 3ec4722
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/documentation/changeLog.txt b/documentation/changeLog.txt
@@ -64,6 +64,10 @@ Server Fixes
 --Fixed disappearing springs caused by map cache not being aware of grid
   placement status.  Fixes #319
 
+--Trees and other permanent objects regrowing destroy sections of underlying
+  roads in natural reclamation.  However, surface non-permanent natural objects
+  (stones, iron, etc.) will re-occur on top of the road.  Fixes #334
+
 
 
 Version 238    2019-June-8

diff --git a/server/map.cpp b/server/map.cpp
@@ -7855,6 +7855,16 @@ void stepMapLongTermCulling( int inNumCurrentPlayers ) {
 
                             // put proc-genned map value in there
                             setMapObject( x, y, wildTile );
+
+                            if( wildTile != 0 &&
+                                getObject( wildTile )->permanent ) {
+                                // something nautural occurs here
+                                // this "breaks" any remaining floor
+                                // (which may be cull-proof on its own below).
+                                // this will effectively leave gaps in roads
+                                // with trees growing through, etc.
+                                setMapFloor( x, y, 0 );
+                                }                            
                             }
                         }
                     }