diff options
| author | Raphael Langella <raphael.langella@gmail.com> | 2011-03-22 16:43:39 +0100 |
|---|---|---|
| committer | Raphael Langella <raphael.langella@gmail.com> | 2011-03-22 19:00:40 +0100 |
| commit | 248b1231d70315761e33c144919c688d05146e57 (patch) | |
| tree | d06b8f52c4859197c05c71f72278495c2f08e136 /crawl-ref/source/skills2.h | |
| parent | a49dc2bece9d53282d7e1abaac8b37bcc28c4ce9 (diff) | |
| download | crawl-ref-248b1231d70315761e33c144919c688d05146e57.tar.gz crawl-ref-248b1231d70315761e33c144919c688d05146e57.zip | |
Fix autoexplore stopping with no monster in sight.
See #3609.
Diffstat (limited to 'crawl-ref/source/skills2.h')
| -rw-r--r-- | crawl-ref/source/skills2.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/crawl-ref/source/skills2.h b/crawl-ref/source/skills2.h index 7664caf88f..9dd4812f05 100644 --- a/crawl-ref/source/skills2.h +++ b/crawl-ref/source/skills2.h @@ -103,19 +103,20 @@ enum skill_menu_flags SKMF_ACTION_MASK = 0x000F, //Display - SKMF_DISP_PROGRESS = 0x0010, - SKMF_DISP_RESKILL = 0x0020, - SKMF_DISP_NEW_LEVEL = 0x0040, - SKMF_DISP_POINTS = 0x0080, - SKMF_DISP_MASK = 0x00F0, - SKMF_DISP_ALL = 0x0100, - SKMF_DISP_APTITUDE = 0x0200, + SKMF_DISP_NORMAL = 0x0010, + SKMF_DISP_ENHANCED = 0x0020, + SKMF_DISP_RESKILL = 0x0040, + SKMF_DISP_NEW_LEVEL = 0x0080, + SKMF_DISP_POINTS = 0x0100, + SKMF_DISP_MASK = 0x01F0, + SKMF_DISP_ALL = 0x0200, + SKMF_DISP_APTITUDE = 0x0400, //Ashenzari transfer knowledge ability set this flag. - SKMF_RESKILLING = 0x0400, + SKMF_RESKILLING = 0x0800, - SKMF_SKILL_ICONS = 0x0800, - SKMF_SIMPLE = 0x1000, // Simple mode for tutorial and hint mode. + SKMF_SKILL_ICONS = 0x1000, + SKMF_SIMPLE = 0x2000, // Simple mode for tutorial and hint mode. }; class SkillMenu; @@ -132,6 +133,7 @@ public: skill_type get_skill() const; void set_name(bool keep_hotkey); void set_display(); + void refresh(bool keep_hotkey); int get_id(); bool is_set(int flag) const; bool is_selectable() const; @@ -174,7 +176,7 @@ public: void clear_flag(int flag); void toggle_flag(int flag); void change_action(); - void change_display(); + void change_display(bool init = false); void toggle_practise(skill_type sk, int keyn); void show_description(skill_type sk); void toggle_show_all(); @@ -219,6 +221,7 @@ private: void _set_links(); int _get_next_action() const; int _get_next_display() const; + bool _skill_enhanced() const; }; #endif |