Merge pull request #41346 from Hirmuolio/rootcellar

fix root cellars on map load
CleverRaven · Jun 17, 2020 · fec9f3d · fec9f3d
2 parents 2c5f2e7 + ad255e3
commit fec9f3d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/item.cpp b/src/item.cpp
@@ -8466,10 +8466,10 @@ bool item::has_rotten_away() const
     }
 }
 
-bool item::has_rotten_away( const tripoint &pnt, float spoil_multiplier )
+bool item::has_rotten_away( const tripoint &pnt, float spoil_multiplier, temperature_flag flag )
 {
     if( goes_bad() ) {
-        process_temperature_rot( 1, pnt, nullptr, temperature_flag::NORMAL, spoil_multiplier );
+        process_temperature_rot( 1, pnt, nullptr, flag, spoil_multiplier );
         return has_rotten_away();
     } else {
         contents.remove_rotten( pnt );

diff --git a/src/item.h b/src/item.h
@@ -774,7 +774,8 @@ class item : public visitable<item>
          * used for rot calculation.
          * @return true if the item has rotten away and should be removed, false otherwise.
          */
-        bool has_rotten_away( const tripoint &pnt, float spoil_multiplier = 1.0f );
+        bool has_rotten_away( const tripoint &pnt, float spoil_multiplier = 1.0f,
+                              temperature_flag flag = temperature_flag::NORMAL );
 
         /**
          * Accumulate rot of the item since last rot calculation.

diff --git a/src/map.cpp b/src/map.cpp
@@ -6747,8 +6747,14 @@ void map::loadn( const tripoint &grid, const bool update_vehicles )
 template <typename Container>
 void map::remove_rotten_items( Container &items, const tripoint &pnt )
 {
+    temperature_flag flag;
+    if( ter( pnt ) == t_rootcellar ) {
+        flag = temperature_flag::ROOT_CELLAR;
+    } else {
+        flag = temperature_flag::NORMAL;
+    }
     for( auto it = items.begin(); it != items.end(); ) {
-        if( it->has_rotten_away( pnt ) ) {
+        if( it->has_rotten_away( pnt, 1, flag ) ) {
             if( it->is_comestible() ) {
                 rotten_item_spawn( *it, pnt );
             }