FR 1971637: make "stash_track_decay = true" and "stash_remove_decay = true"

the hardcoded behaviour and remove the options, meaning that rotted-away
flesh chunks will always be removed from the stash tracker.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6377 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 3 insertions, 10 deletions

diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc
index 95a1f323d1..0ec9592511 100644
--- a/crawl-ref/source/stash.cc
+++ b/crawl-ref/source/stash.cc
@@ -390,7 +390,7 @@ std::string Stash::stash_item_name(const item_def &item)
 {
     std::string name = item.name(DESC_NOCAP_A);
 
-    if (!Options.stash_track_decay || !_is_rottable(item))
+    if (!_is_rottable(item))
         return name;
 
     if (item.plus2 <= _min_rot(item))
@@ -604,12 +604,8 @@ void Stash::_update_corpses(long rot_time)
 
         if (new_rot <= _min_rot(item))
         {
-            if (Options.stash_remove_decay)
-            {
-                items.erase(items.begin() + i);
-                continue;
-            }
-            new_rot = _min_rot(item);
+            items.erase(items.begin() + i);
+            continue;
         }
         item.plus2 = static_cast<short>(new_rot);
     }
@@ -1861,9 +1857,6 @@ bool StashTracker::display_search_results(
 
 void StashTracker::update_corpses()
 {
-    if (!Options.stash_track_decay)
-        return;
-
     if (you.elapsed_time - last_corpse_update < 20.0)
         return;