diff options
author | Robert Vollmert <rvollmert@gmx.net> | 2009-11-24 10:11:53 +0100 |
---|---|---|
committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-24 11:05:13 +0100 |
commit | 254c2ac607c3a7add782e947f602ed6effcd3bf1 (patch) | |
tree | b202c85b379f525c368d3a13c557bd6a84719e7d /crawl-ref/source | |
parent | 0c9cba8792edc5ef6eb52dc0a51393c169c4a6b7 (diff) | |
download | crawl-ref-254c2ac607c3a7add782e947f602ed6effcd3bf1.tar.gz crawl-ref-254c2ac607c3a7add782e947f602ed6effcd3bf1.zip |
Remove option target_zero_exp.
The same effect can now be achieved by overriding
ch_target_monster. If anyone wants this, I'm happy
to provide lua code.
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/directn.cc | 8 | ||||
-rw-r--r-- | crawl-ref/source/initfile.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/l_option.cc | 1 | ||||
-rw-r--r-- | crawl-ref/source/mon-info.cc | 3 | ||||
-rw-r--r-- | crawl-ref/source/options.h | 2 |
5 files changed, 3 insertions, 13 deletions
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 07736e93ce..08ef886a18 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -2069,9 +2069,8 @@ static bool _find_monster( const coord_def& where, int mode, bool need_path, if (mon->friendly()) return (false); - // Don't target zero xp monsters, unless target_zero_exp is set. - return (Options.target_zero_exp - || !mons_class_flag(mon->type, M_NO_EXP_GAIN)); + // Don't target zero xp monsters. + return (!mons_class_flag(mon->type, M_NO_EXP_GAIN)); } static bool _find_feature( const coord_def& where, int mode, @@ -2172,9 +2171,6 @@ bool in_los_bounds(const coord_def& p) // Returns 1 if it found something, zero otherwise. If direction // is -1, goes backwards. // -// If the game option target_zero_exp is true, zero experience -// monsters will be targeted. -// //--------------------------------------------------------------- static char _find_square( const coord_def& where, coord_def &mfp, int direction, diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 3c2e79b500..74aa73b6be 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_zero_exp = false; target_wrap = true; target_oos = true; target_los_first = true; @@ -3038,7 +3037,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_zero_exp); else BOOL_OPTION(target_oos); else BOOL_OPTION(target_los_first); else if (key == "target_unshifted_dirs") diff --git a/crawl-ref/source/l_option.cc b/crawl-ref/source/l_option.cc index a5e177eafa..aadaeee5a5 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_zero_exp", &Options.target_zero_exp, 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, diff --git a/crawl-ref/source/mon-info.cc b/crawl-ref/source/mon-info.cc index cb81c83710..0bc3e5c899 100644 --- a/crawl-ref/source/mon-info.cc +++ b/crawl-ref/source/mon-info.cc @@ -324,8 +324,7 @@ void get_monster_info(std::vector<monster_info>& mons) for (unsigned int i = 0; i < visible.size(); i++) { - if (Options.target_zero_exp - || !mons_class_flag( visible[i]->type, M_NO_EXP_GAIN ) + if (!mons_class_flag( visible[i]->type, M_NO_EXP_GAIN ) || visible[i]->type == MONS_KRAKEN_TENTACLE) { mons.push_back(monster_info(visible[i])); diff --git a/crawl-ref/source/options.h b/crawl-ref/source/options.h index e58d0cbe6e..0abe1b0b3c 100644 --- a/crawl-ref/source/options.h +++ b/crawl-ref/source/options.h @@ -277,8 +277,6 @@ public: std::vector<std::string> dump_order; bool level_map_title; // Show title in level map - bool target_zero_exp; // If true, targetting targets zero-exp - // monsters. 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 |