RIP stash_tracking option, always set to all now.

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

8 files changed, 23 insertions, 60 deletions

diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index e401956eaa..111e38c92d 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -53,7 +53,7 @@ The contents of this text are:
                 runrest_ignore_monster, trapwalk_safe_hp, 
                 trap_prompt, rest_wait_both
 4-h     Stashes.
-                stash_tracking, stash_filter, annotate_item_class,
+                stash_filter, annotate_item_class,
                 annoate_item_dropped
 4-i     Command Enhancements.
                 auto_list, easy_open, easy_unequip, easy_confirm, 
@@ -529,9 +529,7 @@ target_oos = true
         target_oos to true allows you to jump the cursor to dungeon 
         features (<> for stairs, Tab for shops, ^ for traps) and stashes 
         (with the '*' and '/' keys) that are outside line-of-sight but 
-        in the main view. This is most sensibly used in connection with 
-             stash_tracking = all (see 4-g).  
-        Also see target_los_first below.
+        in the main view. Also see target_los_first below.
 
 target_los_first = true
         When cycling through items/features with the 'x' look-around 
@@ -755,13 +753,11 @@ travel_avoid_terrain = (shallow water | deep water)
         will prevent travel or explore from going through any water.
 
 explore_greedy = true
-        Greedy explore travels to items that are eligible for autopickup 
-        in addition to exploring the level, but is otherwise identical 
-        to regular explore. Greedy explore is only available with
-        stash_tracking = all (for any other value of stash_tracking, 
-        normal explore behaviour is used). Greedy explore is also best 
-        with pickup_dropped = false. Explore greed is disabled if you're
-        temporarily unable to pick up items (from uncontrolled 
+        Greedy explore travels to items that are eligible for
+        autopickup in addition to exploring the level, but is
+        otherwise identical to regular explore. Greedy explore is best
+        with pickup_dropped = false. Explore greed is disabled if
+        you're temporarily unable to pick up items (from uncontrolled
         levitation, for instance).
 
 explore_stop = items,greedy_pickup,stairs,shops,altars,gates
@@ -901,30 +897,11 @@ rest_wait_both = false
 4-h     Stashes.
 ----------------
 
-stash_tracking = (all | explicit | dropped)
-        A stash is a heap of items tracked by Crawl. You can search in 
-        your stashes with Ctrl-F. This options rules how stashes are 
-        generated. When stash_tracking is set to 'all' (the default), 
-        the game marks any square where it sees any object as a stash. 
-        That gives you a comprehensive list of everything your character 
-        sees in the dungeon, but may slow the game down and use too much 
-        memory on older computers.
-
-        With 'explicit', you have to explicitly tell the game what 
-        squares you want it to keep track of. You do that by stepping 
-        onto the square containing your stash of goodies and hitting 
-        Ctrl+S. The game will now keep track of what's on the square, 
-        when you add and remove stuff from your stash. You can also 
-        inscribe an item with "=s" to automatically mark a square as a 
-        stash whenever that item is dropped.  If you remove everything 
-        from that square, the game will stop tracking the square 
-        altogether. You can also erase a stash square with Ctrl-E. 
-        Explicitly marked stashes will never be sacrificed by a 
-        Nemelex Xobeh worshipper.
-
-        When stash_tracking is set to 'dropped', any square where you 
-        drop something becomes a stash, and the game keeps track of all 
-        such squares. You can still use Ctrl-S and Ctrl-E as above.
+A stash is a heap of items tracked by Crawl. You can search in your
+stashes with Ctrl-F. The weird name "stash" is for historical reasons
+when the stash-tracker tracked only specific stashes that you asked it
+to. Modern Crawls track all items in the dungeon without the need for
+explicit steps.
 
 stash_filter = <list of numbers>
         This option allows filtering certain classes of items when 
diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt
index cf1924e631..3ed379ea86 100644
--- a/crawl-ref/settings/init.txt
+++ b/crawl-ref/settings/init.txt
@@ -192,7 +192,6 @@ include = travel_stoppers.txt
 
 ##### 4-h	Stashes ###############################
 #
-# stash_tracking = (all | explicit | dropped)
 # stash_filter = 14, 4:21
 # annotate_item_class = true
 # annotate_item_dropped = true
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc
index 0b497f6cc0..e968f582b3 100644
--- a/crawl-ref/source/abyss.cc
+++ b/crawl-ref/source/abyss.cc
@@ -457,7 +457,10 @@ void area_shift(void)
         // Nuke items.
 #ifdef DEBUG_ABYSS
         if (igrd(*ri) != NON_ITEM)
-            mprf(MSGCH_DIAGNOSTICS, "Nuke item stack at (%d, %d)", i, j);
+        {
+            const coord_def &p(*ri);
+            mprf(MSGCH_DIAGNOSTICS, "Nuke item stack at (%d, %d)", p.x, p.y);
+        }
 #endif
         lose_item_stack( *ri );
 
@@ -472,7 +475,7 @@ void area_shift(void)
 
         // Move terrain.
         grd(newpos) = grd(*ri);
-        
+
         // Move item.
 #ifdef DEBUG_ABYSS
         if (igrd(*ri) != NON_ITEM)
@@ -840,12 +843,12 @@ static void _corrupt_square(const crawl_environment &oenv, const coord_def &c)
 #ifdef USE_TILE
     if (feat == DNGN_ROCK_WALL)
     {
-        env.tile_flv(c).wall = tile_DNGN_start[IDX_WALL_UNDEAD] 
+        env.tile_flv(c).wall = tile_DNGN_start[IDX_WALL_UNDEAD]
             + random2(tile_DNGN_count[IDX_WALL_UNDEAD]);
     }
     else if (feat == DNGN_FLOOR)
     {
-        env.tile_flv(c).floor = tile_DNGN_start[IDX_FLOOR_NERVES] 
+        env.tile_flv(c).floor = tile_DNGN_start[IDX_FLOOR_NERVES]
             + random2(tile_DNGN_count[IDX_FLOOR_NERVES]);
     }
 #endif
@@ -859,7 +862,7 @@ static void _corrupt_level_features(const crawl_environment &oenv)
 
     for (int i = 0, size = corrupt_markers.size(); i < size; ++i)
         corrupt_seeds.push_back(corrupt_markers[i]->pos);
-    
+
     for ( rectangle_iterator ri(MAPGEN_BORDER); ri; ++ri )
     {
         int distance = GXM * GXM + GYM * GYM;
@@ -869,7 +872,7 @@ static void _corrupt_level_features(const crawl_environment &oenv)
             if (dist < distance)
                 distance = dist;
         }
-        
+
         if ((distance < 6 || one_chance_in(1 + distance - 6))
             && _is_grid_corruptible(*ri))
         {
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 52baa4b73d..30ad0506bd 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1296,7 +1296,6 @@ static bool _cmd_is_repeatable(command_type cmd, bool is_again = false)
     case CMD_SUSPEND_GAME:
     case CMD_QUIT:
     case CMD_DESTROY_ITEM:
-    case CMD_MARK_STASH:
     case CMD_FORGET_STASH:
     case CMD_FIX_WAYPOINT:
     case CMD_CLEAR_MAP:
@@ -2002,11 +2001,6 @@ void process_command( command_type cmd )
         StashTrack.search_stashes();
         break;
 
-    case CMD_MARK_STASH:
-        if (Options.stash_tracking >= STM_EXPLICIT)
-            StashTrack.add_stash(-1, -1, true);
-        break;
-
     case CMD_FORGET_STASH:
         if (Options.stash_tracking >= STM_EXPLICIT)
             StashTrack.no_stash();
@@ -4053,7 +4047,7 @@ static void _move_player(coord_def move)
             move.y = random2(3) - 1;
             you.reset_prev_move();
         }
-        
+
         const coord_def& new_targ = you.pos() + move;
         if (!in_bounds(new_targ) || !you.can_pass_through(new_targ))
         {
diff --git a/crawl-ref/source/cmd-keys.h b/crawl-ref/source/cmd-keys.h
index 259915380b..cfeb71b1c9 100644
--- a/crawl-ref/source/cmd-keys.h
+++ b/crawl-ref/source/cmd-keys.h
@@ -99,7 +99,6 @@
 {CONTROL('P'), CMD_REPLAY_MESSAGES},
 {CONTROL('Q'), CMD_QUIT},
 {CONTROL('R'), CMD_REDRAW_SCREEN},
-{CONTROL('S'), CMD_MARK_STASH},
 {CONTROL('T'), CMD_TOGGLE_FRIENDLY_PICKUP},
 {CONTROL('W'), CMD_FIX_WAYPOINT},
 {CONTROL('X'), CMD_SAVE_GAME_NOW},
diff --git a/crawl-ref/source/cmd-name.h b/crawl-ref/source/cmd-name.h
index 5a537d8747..a044f5152a 100644
--- a/crawl-ref/source/cmd-name.h
+++ b/crawl-ref/source/cmd-name.h
@@ -87,7 +87,6 @@
 {CMD_QUIT, "CMD_QUIT"},
 {CMD_WIZARD, "CMD_WIZARD"},
 {CMD_DESTROY_ITEM, "CMD_DESTROY_ITEM"},
-{CMD_MARK_STASH, "CMD_MARK_STASH"},
 {CMD_FORGET_STASH, "CMD_FORGET_STASH"},
 {CMD_SEARCH_STASHES, "CMD_SEARCH_STASHES"},
 {CMD_EXPLORE, "CMD_EXPLORE"},
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 40049ec070..099cd925fd 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -495,7 +495,6 @@ enum command_type
     CMD_WIZARD,
     CMD_DESTROY_ITEM,
 
-    CMD_MARK_STASH,
     CMD_FORGET_STASH,
     CMD_SEARCH_STASHES,
     CMD_EXPLORE,
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 503f2911f1..b07a088383 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -2672,14 +2672,7 @@ void game_options::read_option_line(const std::string &str, bool runscript)
     else BOOL_OPTION(explore_greedy);
     else BOOL_OPTION(explore_improved);
 
-        BOOL_OPTION(trap_prompt);
-        else if (key == "stash_tracking")
-    {
-        stash_tracking =
-             field == "dropped" ? STM_DROPPED  :
-             field == "all"     ? STM_ALL      :
-                                  STM_EXPLICIT;
-    }
+    BOOL_OPTION(trap_prompt);
     else if (key == "stash_filter")
     {
         std::vector<std::string> seg = split_string(",", field);