diff options
| author | Chris Campbell <chriscampbell89@gmail.com> | 2012-09-13 22:34:47 +0100 |
|---|---|---|
| committer | Chris Campbell <chriscampbell89@gmail.com> | 2012-09-13 22:34:47 +0100 |
| commit | cbd4a6cdf5324d923391d2cf17b79e20573c8c17 (patch) | |
| tree | 18696265d984c97d0e7d6df9a0ac9432abc05ebd /crawl-ref/source/religion.h | |
| parent | d5ade8a6ad85edd80ad10e973ecbeb0ef5fcab7a (diff) | |
| parent | 8a8741c62bbea34d976ba40458bb1ad1e4caf8a7 (diff) | |
| download | crawl-ref-cbd4a6cdf5324d923391d2cf17b79e20573c8c17.tar.gz crawl-ref-cbd4a6cdf5324d923391d2cf17b79e20573c8c17.zip | |
Merge branch 'master' into vehumet
Diffstat (limited to 'crawl-ref/source/religion.h')
| -rw-r--r-- | crawl-ref/source/religion.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h index 36eabfe9cb..5d60bee5d7 100644 --- a/crawl-ref/source/religion.h +++ b/crawl-ref/source/religion.h @@ -32,13 +32,13 @@ god_type random_god(bool available = true); void simple_god_message(const char *event, god_type which_deity = you.religion); int piety_breakpoint(int i); -std::string god_name(god_type which_god, bool long_name = false); -std::string god_name_jiyva(bool second_name = false); -god_type str_to_god(const std::string &name, bool exact = true); +string god_name(god_type which_god, bool long_name = false); +string god_name_jiyva(bool second_name = false); +god_type str_to_god(const string &name, bool exact = true); -std::string get_god_powers(god_type which_god); -std::string get_god_likes(god_type which_god, bool verbose = false); -std::string get_god_dislikes(god_type which_god, bool verbose = false); +string get_god_powers(god_type which_god); +string get_god_likes(god_type which_god, bool verbose = false); +string get_god_dislikes(god_type which_god, bool verbose = false); void dec_penance(int val); void dec_penance(god_type god, int val); @@ -97,9 +97,8 @@ bool vehumet_is_currently_gifting(); bool vehumet_accept_gift(); bool god_hates_attacking_friend(god_type god, const actor *fr); -bool god_hates_attacking_friend(god_type god, monster_type species); bool god_likes_item(god_type god, const item_def& item); -bool god_likes_items(god_type god); +bool god_likes_items(god_type god, bool greedy_explore = false); void get_pure_deck_weights(int weights[]); @@ -112,9 +111,9 @@ int get_fuzzied_monster_difficulty(const monster *mons); bool do_god_gift(bool forced = false); -std::vector<god_type> temple_god_list(); -std::vector<god_type> nontemple_god_list(); +vector<god_type> temple_god_list(); +vector<god_type> nontemple_god_list(); extern const char* god_gain_power_messages[NUM_GODS][MAX_GOD_ABILITIES]; -std::string adjust_abil_message(const char *pmsg, bool allow_upgrades = true); +string adjust_abil_message(const char *pmsg, bool allow_upgrades = true); #endif |