diff options
| -rw-r--r-- | crawl-ref/docs/options_guide.txt | 15 | ||||
| -rw-r--r-- | crawl-ref/settings/init.txt | 2 | ||||
| -rw-r--r-- | crawl-ref/source/directn.cc | 15 | ||||
| -rw-r--r-- | crawl-ref/source/initfile.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/options.h | 4 |
5 files changed, 7 insertions, 33 deletions
diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt index f2222c4ba7..f9abc58284 100644 --- a/crawl-ref/docs/options_guide.txt +++ b/crawl-ref/docs/options_guide.txt @@ -29,8 +29,7 @@ The contents of this text are: chunks_autopickup, assign_item_slot, drop_mode, pickup_mode, drop_filter, default_friendly_pickup 4-b Targeting. - target_oos, target_los_first, default_target, - target_unshifted_dirs, darken_beyond_range + default_target, target_unshifted_dirs, darken_beyond_range 4-c Passive Sightings (detected and remembered entities). detected_monster_colour, detected_item_colour, remembered_monster_colour, colour_map, clean_map @@ -568,18 +567,6 @@ default_friendly_pickup = (friend | player | none | all) 4-b Targeting. ------------------- -target_oos = true - When cycling through items with 'x' look-around, setting - 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. Also see target_los_first below. - -target_los_first = true - When cycling through items/features with the 'x' look-around - command, setting target_los_first to true will force the cursor - to squares in line-of-sight before going to squares outside LOS. - default_target = true If set to true (the default), targeting will start on either your previous target (if it is still visible) or the closest diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt index f21c799e7b..d345f58f2f 100644 --- a/crawl-ref/settings/init.txt +++ b/crawl-ref/settings/init.txt @@ -112,8 +112,6 @@ drop_filter = useless_item ##### 4-b Targetting ############################ # -# target_oos = false -# target_los_first = false # default_target = false # target_unshifted_dirs = true # darken_beyond_range = false diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 11031e0da2..2b1e6731f1 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -1342,8 +1342,7 @@ void direction(dist& moves, const targetting_type restricts, const int thing_to_find = _targetting_cmd_to_feature(key_command); if (_find_square_wrapper(moves.target, objfind_pos, 1, _find_feature, needs_path, thing_to_find, - range, true, Options.target_los_first ? - LOS_FLIPVH : LOS_ANY)) + range, true, LOS_FLIPVH)) { moves.target = objfind_pos; } @@ -1433,11 +1432,9 @@ void direction(dist& moves, const targetting_type restricts, case CMD_TARGET_OBJ_CYCLE_BACK: case CMD_TARGET_OBJ_CYCLE_FORWARD: dir = (key_command == CMD_TARGET_OBJ_CYCLE_BACK) ? -1 : 1; - if (_find_square_wrapper( moves.target, objfind_pos, dir, - _find_object, needs_path, TARG_ANY, range, - true, Options.target_los_first ? - (dir == 1? LOS_FLIPVH : LOS_FLIPHV) - : LOS_ANY)) + if (_find_square_wrapper(moves.target, objfind_pos, dir, + _find_object, needs_path, TARG_ANY, range, + true, (dir > 0 ? LOS_FLIPVH : LOS_FLIPHV))) { moves.target = objfind_pos; } @@ -2077,7 +2074,7 @@ static bool _find_feature( const coord_def& where, int mode, bool /* need_path */, int /* range */) { // The stair need not be in LOS if the square is mapped. - if (!in_los(where) && (!Options.target_oos || !is_terrain_seen(where))) + if (!in_los(where) && !is_terrain_seen(where)) return (false); return is_feature(mode, where); @@ -2101,7 +2098,7 @@ static bool _find_object(const coord_def& where, int mode, if (item == NON_ITEM && !is_mimic) return (false); - return (in_los(where) || Options.target_oos && is_terrain_seen(where) + return (in_los(where) || is_terrain_seen(where) && (is_stash(where.x,where.y) || is_mimic)); } diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 4cd18924de..1749324e88 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -769,8 +769,6 @@ void game_options::reset_options() explore_improved = false; trap_prompt = true; - target_oos = true; - target_los_first = true; target_unshifted_dirs = false; darken_beyond_range = true; @@ -3036,8 +3034,6 @@ void game_options::read_option_line(const std::string &str, bool runscript) } else BOOL_OPTION(dump_book_spells); else BOOL_OPTION(level_map_title); - else BOOL_OPTION(target_oos); - else BOOL_OPTION(target_los_first); else if (key == "target_unshifted_dirs") { target_unshifted_dirs = _read_bool(field, target_unshifted_dirs); diff --git a/crawl-ref/source/options.h b/crawl-ref/source/options.h index ca45ac3748..006641fbe3 100644 --- a/crawl-ref/source/options.h +++ b/crawl-ref/source/options.h @@ -277,10 +277,6 @@ public: std::vector<std::string> dump_order; bool level_map_title; // Show title in level map - bool target_oos; // 'x' look around can target out-of-LOS - bool target_los_first; // 'x' look around first goes to visible - // objects/features, then goes to stuff - // outside LOS. bool target_unshifted_dirs; // Unshifted keys target if cursor is // on player. |