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/spl-book.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/spl-book.h')
| -rw-r--r-- | crawl-ref/source/spl-book.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/spl-book.h b/crawl-ref/source/spl-book.h index eb307cc1bb..ed39950d38 100644 --- a/crawl-ref/source/spl-book.h +++ b/crawl-ref/source/spl-book.h @@ -38,7 +38,7 @@ bool learn_spell(spell_type spell, int book = NUM_BOOKS, bool is_safest_book = true); bool forget_spell_from_book(spell_type spell, const item_def* book); -std::string desc_cannot_memorise_reason(bool undead); +string desc_cannot_memorise_reason(bool undead); bool player_can_memorise_from_spellbook(const item_def &book); spell_type which_spell_in_book(const item_def &book, int spl); @@ -52,7 +52,7 @@ bool you_cannot_memorise(spell_type spell); bool you_cannot_memorise(spell_type spell, bool &undead); bool has_spells_to_memorise(bool silent = true, int current_spell = SPELL_NO_SPELL); -std::vector<spell_type> get_mem_spell_list(std::vector<int> &books); +vector<spell_type> get_mem_spell_list(vector<int> &books); int spellbook_contents(item_def &book, read_book_action_type action, formatted_string *fs = NULL); @@ -60,17 +60,17 @@ int spellbook_contents(item_def &book, read_book_action_type action, int count_rod_spells(const item_def &item, bool need_id); bool make_book_level_randart(item_def &book, int level = -1, - int num_spells = -1, std::string owner = ""); + int num_spells = -1, string owner = ""); bool make_book_theme_randart(item_def &book, int disc1 = 0, int disc2 = 0, int num_spells = -1, int max_levels = -1, spell_type incl_spell = SPELL_NO_SPELL, - std::string owner = "", std::string title = ""); + string owner = "", string title = ""); bool make_book_theme_randart(item_def &book, - std::vector<spell_type> incl_spells, + vector<spell_type> incl_spells, int disc1 = 0, int disc2 = 0, int num_spells = -1, int max_levels = -1, - std::string owner = "", std::string title = ""); + string owner = "", string title = ""); void make_book_Roxanne_special(item_def *book); void make_book_Kiku_gift(item_def &book, bool first); |