From 9cb75b706542bbc4043437f25a5e35dbfd99656e Mon Sep 17 00:00:00 2001 From: zelgadis Date: Thu, 3 Jul 2008 23:53:53 +0000 Subject: 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 --- crawl-ref/source/externs.h | 4 ---- crawl-ref/source/initfile.cc | 5 ----- crawl-ref/source/stash.cc | 13 +++---------- 3 files changed, 3 insertions(+), 19 deletions(-) (limited to 'crawl-ref/source') diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h index 0fb8794be9..5e241f6292 100644 --- a/crawl-ref/source/externs.h +++ b/crawl-ref/source/externs.h @@ -1739,10 +1739,6 @@ public: int stash_tracking; // How stashes are tracked - bool stash_track_decay; // Keep track of how decayed corpses are - bool stash_remove_decay; // Remove corpses that have most probably - // completely rotted away - int tc_reachable; // Colour for squares that are reachable int tc_excluded; // Colour for excluded squares. int tc_exclude_circle; // Colour for squares in the exclusion radius diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 9127da00d7..2d8ec1b2ce 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -743,9 +743,6 @@ void game_options::reset_options() stash_tracking = STM_ALL; - stash_track_decay = false; - stash_remove_decay = false; - explore_stop = ES_ITEM | ES_STAIR | ES_PORTAL | ES_SHOP | ES_ALTAR | ES_GREEDY_PICKUP; @@ -2595,8 +2592,6 @@ void game_options::read_option_line(const std::string &str, bool runscript) field == "all" ? STM_ALL : STM_EXPLICIT; } - else BOOL_OPTION(stash_track_decay); - else BOOL_OPTION(stash_remove_decay); else if (key == "stash_filter") { std::vector seg = split_string(",", field); 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(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; -- cgit v1.2.3-54-g00ecf