Back out "Move remove_creature_from_reachability calls from the destr…

…uctor to on_unload. The avatar never unloads. (CleverRaven#69368)" Original commit changeset: e8f77ab
akrieger · Nov 15, 2023 · 7bc616e · 7bc616e
1 parent d586ccb
commit 7bc616e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/creature.cpp b/src/creature.cpp
@@ -168,7 +168,12 @@ Creature::Creature( Creature && ) noexcept( map_is_noexcept &&list_is_noexcept )
 Creature &Creature::operator=( const Creature & ) = default;
 Creature &Creature::operator=( Creature && ) noexcept = default;
 
-Creature::~Creature() = default;
+Creature::~Creature()
+{
+    if( g ) {
+        get_map().remove_creature_from_reachability( this );
+    }
+}
 
 tripoint Creature::pos() const
 {

diff --git a/src/monster.cpp b/src/monster.cpp
@@ -3703,7 +3703,6 @@ bool monster::will_join_horde( int size )
 void monster::on_unload()
 {
     last_updated = calendar::turn;
-    get_map().remove_creature_from_reachability( this );
 }
 
 void monster::on_load()

diff --git a/src/npc.cpp b/src/npc.cpp
@@ -3196,7 +3196,6 @@ void npc::add_new_mission( class mission *miss )
 
 void npc::on_unload()
 {
-    get_map().remove_creature_from_reachability( this );
 }
 
 // A throtled version of player::update_body since npc's don't need to-the-turn updates.
-Original file line number
+Diff line change
@@ Expand Up / @@ -3196,7 +3196,6 @@ void npc::add_new_mission( class mission *miss ) @@
     void npc::on_unload()
     {
-        get_map().remove_creature_from_reachability( this );
     }
     // A throtled version of player::update_body since npc's don't need to-the-turn updates.
@@ Expand Down @@