diff options
| -rw-r--r-- | crawl-ref/source/directn.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/initfile.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/l_option.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/options.h | 1 |
4 files changed, 3 insertions, 6 deletions
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 9688c986ec..11031e0da2 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -1227,7 +1227,7 @@ void direction(dist& moves, const targetting_type restricts, if (_find_square_wrapper(moves.target, monsfind_pos, 1, _find_mlist, needs_path, idx, range, - Options.target_wrap)) + true)) { moves.target = monsfind_pos; } @@ -1451,7 +1451,7 @@ void direction(dist& moves, const targetting_type restricts, dir = (key_command == CMD_TARGET_CYCLE_BACK) ? -1 : 1; if (_find_square_wrapper( moves.target, monsfind_pos, dir, _find_monster, needs_path, mode, range, - Options.target_wrap)) + true)) { moves.target = monsfind_pos; } @@ -1460,7 +1460,7 @@ void direction(dist& moves, const targetting_type restricts, if (needs_path && !just_looking && _find_square_wrapper(moves.target, monsfind_pos, dir, _find_monster, false, mode, - range, Options.target_wrap)) + range, true)) { mpr("All monsters which could be auto-targeted " "are covered by a wall or statue which interrupts " diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 74aa73b6be..4cd18924de 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -769,7 +769,6 @@ void game_options::reset_options() explore_improved = false; trap_prompt = true; - target_wrap = true; target_oos = true; target_los_first = true; target_unshifted_dirs = false; diff --git a/crawl-ref/source/l_option.cc b/crawl-ref/source/l_option.cc index aadaeee5a5..044e9703e9 100644 --- a/crawl-ref/source/l_option.cc +++ b/crawl-ref/source/l_option.cc @@ -54,7 +54,6 @@ static option_handler handlers[] = { "pickup_dropped", &Options.pickup_dropped, option_hboolean }, { "show_waypoints", &Options.show_waypoints, option_hboolean }, { "item_colour", &Options.item_colour, option_hboolean }, - { "target_wrap", &Options.target_wrap, option_hboolean }, { "easy_exit_menu", &Options.easy_exit_menu, option_hboolean }, { "dos_use_background_intensity", &Options.dos_use_background_intensity, option_hboolean }, diff --git a/crawl-ref/source/options.h b/crawl-ref/source/options.h index 0abe1b0b3c..ca45ac3748 100644 --- a/crawl-ref/source/options.h +++ b/crawl-ref/source/options.h @@ -277,7 +277,6 @@ public: std::vector<std::string> dump_order; bool level_map_title; // Show title in level map - bool target_wrap; // Wrap around from last to first target 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 |