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/quiver.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/quiver.h')
| -rw-r--r-- | crawl-ref/source/quiver.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/quiver.h b/crawl-ref/source/quiver.h index 500ef24fac..968a6fef73 100644 --- a/crawl-ref/source/quiver.h +++ b/crawl-ref/source/quiver.h @@ -32,8 +32,8 @@ class player_quiver // Queries from engine -- don't affect state void get_desired_item(const item_def** item_out, int* slot_out) const; - int get_fire_item(std::string* no_item_reason = 0) const; - void get_fire_order(std::vector<int>& v, bool manual) const; + int get_fire_item(string* no_item_reason = 0) const; + void get_fire_order(vector<int>& v, bool manual) const; // Callbacks from engine void set_quiver(const item_def &item, ammo_t ammo_type); @@ -48,7 +48,7 @@ class player_quiver void load(reader&); private: - void _get_fire_order(std::vector<int>&, + void _get_fire_order(vector<int>&, bool ignore_inscription_etc, const item_def* launcher, bool manual) const; |