Merge pull request #34198 from BevapDin/bpl

Don't access the main game map from mapgen code.
CleverRaven · Sep 23, 2019 · be19091 · be19091
2 parents e3f41b4 + 3832563
commit be19091
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/debug_menu.cpp b/src/debug_menu.cpp
@@ -1498,6 +1498,9 @@ void debug()
                         tinymap mx_map;
                         mx_map.load( where_sm, false );
                         MapExtras::apply_function( mx_str[mx_choice], mx_map, where_sm );
+                        g->load_npcs();
+                        g->m.invalidate_map_cache( g->get_levz() );
+                        g->refresh_all();
                     }
                 }
                 break;

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
@@ -7940,10 +7940,6 @@ bool update_mapgen_function_json::update_map( const tripoint &omt_pos, const poi
         md.m.save();
     }
 
-    g->load_npcs();
-    g->m.invalidate_map_cache( md.zlevel() );
-    g->refresh_all();
-
     return applied;
 }