clear out map memory when switching dimensions

Author: Blueflowerss

src/avatar.cpp

@@ -250,6 +250,11 @@ void avatar::load_map_memory()
     player_map_memory->load( pos_abs() );
 }
 
+void avatar::clear_map_memory()
+{
+    player_map_memory->clear();
+}
+
 void avatar::prepare_map_memory_region( const tripoint_abs_ms &p1, const tripoint_abs_ms &p2 )
 {
     player_map_memory->prepare_region( p1, p2 );

src/avatar.h

@@ -99,6 +99,7 @@ class avatar : public Character
         void deserialize( const JsonObject &data ) override;
         bool save_map_memory();
         void load_map_memory();
+        void clear_map_memory();
 
         // newcharacter.cpp
         bool create( character_type type, const std::string &tempname = "" );

src/game.cpp

@@ -1,4 +1,5 @@
 #include "game.h"
+#include "map_memory.h"
 
 #include <algorithm>
 #include <bitset>
@@ -12751,6 +12752,7 @@ bool game::travel_to_dimension( const std::string &new_prefix )
     if( !save_maps() ) {
         return false;
     }
+    player.save_map_memory();
     for( int z = -OVERMAP_DEPTH; z <= OVERMAP_HEIGHT; z++ ) {
         here.clear_vehicle_list( z );
     }
@@ -12764,10 +12766,10 @@ bool game::travel_to_dimension( const std::string &new_prefix )
     }
     // Load in data specific to the dimension (like weather)
     //if( !load_dimension_data() ) {
-        // dimension data file not found/created yet
-        /* handle weather instance switching when I have dimensions with different region settings,
-         right now they're all the same and it's hard to tell if it's working or not. */
-        // weather.set_nextweather( calendar::turn );
+    // dimension data file not found/created yet
+    /* handle weather instance switching when I have dimensions with different region settings,
+     right now they're all the same and it's hard to tell if it's working or not. */
+    // weather.set_nextweather( calendar::turn );
     //}
     // Ensure the new world has compression files
     world_generator->active_world->assure_compression_files_present();
@@ -12780,6 +12782,10 @@ bool game::travel_to_dimension( const std::string &new_prefix )
     overmap_buffer.clear();
     // load/create new overmap
     overmap_buffer.get( point_abs_om{} );
+    // clear map memory from the previous dimension
+    player.clear_map_memory();
+    // Load map memory in new dimension, if there is any
+    player.load_map_memory();
     // Loads submaps and invalidate related caches
     here.load( tripoint_abs_sm( here.get_abs_sub() ), false );
 

src/map_memory.cpp

@@ -554,7 +554,12 @@ bool map_memory::save( const tripoint_abs_ms &pos )
 
     return result;
 }
-
+void map_memory::clear()
+{
+    clear_cache();
+    submaps.clear();
+    dbg( D_INFO ) << "[CLEAR] Done.";
+}
 void map_memory::clear_cache()
 {
     cached.clear();

src/map_memory.h

@@ -124,6 +124,8 @@ class map_memory
         /** Save memorized submaps to disk, drop ones far from given global map square pos. */
         bool save( const tripoint_abs_ms &pos );
 
+        /** Clear out loaded map memory */
+        void clear();
         /**
          * Prepares map memory for rendering and/or memorization of given region.
          * @param p1 top-left corner of the region, in global ms coords