diff options
| author | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 22:50:06 +0200 |
|---|---|---|
| committer | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 23:06:30 +0200 |
| commit | 770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch) | |
| tree | e030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/tilereg-dgn.h | |
| parent | a6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff) | |
| download | crawl-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/tilereg-dgn.h')
| -rw-r--r-- | crawl-ref/source/tilereg-dgn.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/tilereg-dgn.h b/crawl-ref/source/tilereg-dgn.h index b07d80bbba..52e33006b9 100644 --- a/crawl-ref/source/tilereg-dgn.h +++ b/crawl-ref/source/tilereg-dgn.h @@ -11,11 +11,11 @@ class mcache_entry; struct TextTag { - std::string tag; + string tag; coord_def gc; }; -bool tile_dungeon_tip(const coord_def &gc, std::string &tip); +bool tile_dungeon_tip(const coord_def &gc, string &tip); int tile_click_cell(const coord_def &gc, unsigned char mod); class DungeonRegion : public TileRegion @@ -27,8 +27,8 @@ public: virtual void render(); virtual void clear(); virtual int handle_mouse(MouseEvent &event); - virtual bool update_tip_text(std::string &tip); - virtual bool update_alt_text(std::string &alt); + virtual bool update_tip_text(string &tip); + virtual bool update_alt_text(string &alt); virtual void on_resize(); void load_dungeon(const crawl_view_buffer &vbuf, const coord_def &gc); @@ -36,7 +36,7 @@ public: bool on_screen(const coord_def &gc) const; void clear_text_tags(text_tag_type type); - void add_text_tag(text_tag_type type, const std::string &tag, + void add_text_tag(text_tag_type type, const string &tag, const coord_def &gc); const coord_def &get_cursor() const { return m_cursor[CURSOR_MOUSE]; } @@ -58,7 +58,7 @@ protected: int m_cy_to_gy; coord_def m_cursor[CURSOR_MAX]; coord_def m_last_clicked_grid; - std::vector<TextTag> m_tags[TAG_MAX]; + vector<TextTag> m_tags[TAG_MAX]; DungeonCellBuffer m_buf_dngn; ShapeBuffer m_buf_flash; @@ -68,7 +68,7 @@ protected: coord_def gc; tileidx_t idx; }; - std::vector<tile_overlay> m_overlays; + vector<tile_overlay> m_overlays; }; #endif |