summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/skill_menu.h
diff options
context:
space:
mode:
authorRaphael Langella <raphael.langella@gmail.com>2012-08-26 22:50:06 +0200
committerRaphael Langella <raphael.langella@gmail.com>2012-08-26 23:06:30 +0200
commit770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch)
treee030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/skill_menu.h
parenta6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff)
downloadcrawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.tar.gz
crawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.zip
Use std namespace.
I had to rename distance() (in coord.h) to distance2() because it conflicts with the STL function to compare 2 iterators. Not a bad change given how it returns the square of the distance anyway. I also had to rename the message global variable (in message.cc) to buffer. I tried to fix and improve the coding style has much as I could, but I probably missed a few given how huge and tedious it is. I also didn't touch crawl-gdb.py, and the stuff in prebuilt, rltiles/tool and util/levcomp.*, because I have no clue about those.
Diffstat (limited to 'crawl-ref/source/skill_menu.h')
-rw-r--r--crawl-ref/source/skill_menu.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/skill_menu.h b/crawl-ref/source/skill_menu.h
index e4edac1966..3cf256eea6 100644
--- a/crawl-ref/source/skill_menu.h
+++ b/crawl-ref/source/skill_menu.h
@@ -80,7 +80,7 @@ private:
void _clear();
COLORS get_colour() const;
- std::string get_prefix();
+ string get_prefix();
void set_aptitude();
void set_level();
void set_new_level();
@@ -96,10 +96,10 @@ class SkillMenuSwitch : public FormattedTextItem
public:
static SkillMenu* m_skm;
- SkillMenuSwitch(std::string name, int hotkey);
+ SkillMenuSwitch(string name, int hotkey);
void add(skill_menu_state state);
- std::string get_help();
- std::string get_name(skill_menu_state state);
+ string get_help();
+ string get_name(skill_menu_state state);
skill_menu_state get_state();
void set_state(skill_menu_state state);
int size() const;
@@ -107,9 +107,9 @@ public:
void update();
private:
- std::string m_name;
+ string m_name;
skill_menu_state m_state;
- std::vector<skill_menu_state> m_states;
+ vector<skill_menu_state> m_states;
};
static const int SK_ARR_LN = (ndisplayed_skills - 1) / 2;
@@ -149,7 +149,7 @@ private:
NoSelectTextItem* m_title;
FormattedTextItem* m_help;
- std::map<skill_menu_switch, SkillMenuSwitch*> m_switches;
+ map<skill_menu_switch, SkillMenuSwitch*> m_switches;
FormattedTextItem* m_help_button;
skill_state m_skill_backup;
@@ -163,7 +163,7 @@ private:
void refresh_display();
void refresh_names();
void set_default_help();
- void set_help(std::string msg);
+ void set_help(string msg);
void set_skills();
void set_title();
void shift_bottom_down();