diff options
| author | Raphael Langella <raphael.langella@gmail.com> | 2012-10-08 15:05:38 +0200 |
|---|---|---|
| committer | Raphael Langella <raphael.langella@gmail.com> | 2012-10-08 18:11:11 +0200 |
| commit | 9966aa71c571ff24f06802f12a3ac15ca45d7333 (patch) | |
| tree | 73acdcf4d14d79e215c5e4360526a87822f868c5 /crawl-ref/source/skill_menu.h | |
| parent | 74c35ba6f35c2ecb3e6baf8cf1a6ede7cbdda23d (diff) | |
| download | crawl-ref-9966aa71c571ff24f06802f12a3ac15ca45d7333.tar.gz crawl-ref-9966aa71c571ff24f06802f12a3ac15ca45d7333.zip | |
Make the SkillMenu object a global variable.
Better that than a static member of 2 (and soon 3) other classes.
Diffstat (limited to 'crawl-ref/source/skill_menu.h')
| -rw-r--r-- | crawl-ref/source/skill_menu.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crawl-ref/source/skill_menu.h b/crawl-ref/source/skill_menu.h index 7f3d859ad8..107e660ad3 100644 --- a/crawl-ref/source/skill_menu.h +++ b/crawl-ref/source/skill_menu.h @@ -52,7 +52,6 @@ class SkillMenuEntry { public: static menu_letter2 m_letter; - static SkillMenu* m_skm; SkillMenuEntry() {}; SkillMenuEntry(coord_def coord); @@ -95,8 +94,6 @@ private: class SkillMenuSwitch : public FormattedTextItem { public: - static SkillMenu* m_skm; - SkillMenuSwitch(string name, int hotkey); void add(skill_menu_state state); string get_help(); @@ -119,9 +116,10 @@ static const int SK_ARR_COL = 2; class SkillMenu : public PrecisionMenu { public: - SkillMenu(int flag, int exp); + SkillMenu(); void clear_flag(int flag); + void init(int flag, int exp); bool is_set(int flag) const; void set_flag(int flag); void toggle_flag(int flag); |