diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-17 21:28:56 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-17 21:28:56 +0000 |
| commit | 12de33d2d95164e30a8a2ac960ad28b2a69383e3 (patch) | |
| tree | 4b238a712c0c7f329eed44cc23832f6998c7b2ca /crawl-ref/source/skills2.cc | |
| parent | 46c7199d6ae8c006a78799a1c59dacf4e2d77c8f (diff) | |
| download | crawl-ref-12de33d2d95164e30a8a2ac960ad28b2a69383e3.tar.gz crawl-ref-12de33d2d95164e30a8a2ac960ad28b2a69383e3.zip | |
Another modification of autotargetting submerged monsters, based off
BR 1935715.
* Targeting a square with a known submerged monster ("strange
disturbance" description) always enforces '!' rather than '.'
* Submerged monsters only get targetted if there are no other more
viable targets (dangerous monsters, really) in sight.
The latter uses a heavily modified i_feel_safe() that now draws on
get_playervisible_monsters(), which got numerous new parameters to cover
all possibilities. :p
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4314 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/skills2.cc')
| -rw-r--r-- | crawl-ref/source/skills2.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index 01a120a906..550164c3ee 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -1698,13 +1698,13 @@ static const skill_type skill_display_order[] = static const int ndisplayed_skills = sizeof(skill_display_order) / sizeof(*skill_display_order); -static bool player_knows_aptitudes() +static bool _player_knows_aptitudes() { return !player_genus(GENPC_DRACONIAN) || you.max_level >= 7; } -static void display_skill_table(bool show_aptitudes) +static void _display_skill_table(bool show_aptitudes) { menu_letter lcount = 'a'; const int num_lines = get_number_of_lines(); @@ -1847,7 +1847,7 @@ static void display_skill_table(bool show_aptitudes) textcolor(LIGHTGREY); cprintf("Press the letter of a skill to choose " "whether you want to practise it."); - if (player_knows_aptitudes()) + if (_player_knows_aptitudes()) { cgotoxy(1, bottom_line); formatted_string::parse_string("Press '!' to toggle between " @@ -1864,10 +1864,10 @@ void show_skills() clrscr(); while (true) { - display_skill_table(show_aptitudes); + _display_skill_table(show_aptitudes); const int keyin = getch(); - if (keyin == '!' && player_knows_aptitudes()) + if (keyin == '!' && _player_knows_aptitudes()) { show_aptitudes = !show_aptitudes; continue; |