diff options
-rw-r--r-- | crawl-ref/source/misc.cc | 15 | ||||
-rw-r--r-- | crawl-ref/source/misc.h | 4 | ||||
-rw-r--r-- | crawl-ref/source/religion.cc | 16 | ||||
-rw-r--r-- | crawl-ref/source/religion.h | 2 |
4 files changed, 18 insertions, 19 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 19e5007e87..c40410a955 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -3050,18 +3050,3 @@ bool stop_attack_prompt(const monsters *mon, bool beam_attack, return !(you.confused() || (prompt && yesno(info, false, 'n'))); } - -void set_attack_conducts(const monsters *mon, god_conduct_trigger& conduct, - bool known) -{ - if (mons_friendly(mon)) - conduct.set(DID_ATTACK_FRIEND, 5, known, mon); - else if (mons_neutral(mon)) - conduct.set(DID_ATTACK_NEUTRAL, 5, known, mon); - - if (is_unchivalric_attack(&you, mon, mon)) - conduct.set(DID_UNCHIVALRIC_ATTACK, 4, known, mon); - - if (mons_is_holy(mon)) - conduct.set(DID_ATTACK_HOLY, mon->hit_dice, known, mon); -} diff --git a/crawl-ref/source/misc.h b/crawl-ref/source/misc.h index 29d1fd7dd3..b268f0fedd 100644 --- a/crawl-ref/source/misc.h +++ b/crawl-ref/source/misc.h @@ -14,7 +14,6 @@ #define MISC_H #include "externs.h" -#include "religion.h" struct bolt; struct dist; @@ -149,7 +148,4 @@ std::string your_hand(bool plural); bool stop_attack_prompt(const monsters *mon, bool beam_attack, bool beam_target); -void set_attack_conducts(const monsters *mon, god_conduct_trigger& conduct, - bool known = true); - #endif diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 871dd819a4..6069c239d1 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -44,6 +44,7 @@ #include "decks.h" #include "describe.h" #include "effects.h" +#include "fight.h" #include "files.h" #include "food.h" #include "invent.h" @@ -2445,6 +2446,21 @@ bool did_god_conduct( conduct_type thing_done, int level, bool known, return (ret); } +void set_attack_conducts(const monsters *mon, god_conduct_trigger& conduct, + bool known) +{ + if (mons_friendly(mon)) + conduct.set(DID_ATTACK_FRIEND, 5, known, mon); + else if (mons_neutral(mon)) + conduct.set(DID_ATTACK_NEUTRAL, 5, known, mon); + + if (is_unchivalric_attack(&you, mon, mon)) + conduct.set(DID_UNCHIVALRIC_ATTACK, 4, known, mon); + + if (mons_is_holy(mon)) + conduct.set(DID_ATTACK_HOLY, mon->hit_dice, known, mon); +} + static void _dock_piety(int piety_loss, int penance) { static long last_piety_lecture = -1L; diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h index 9d3f4d3486..28029e81e0 100644 --- a/crawl-ref/source/religion.h +++ b/crawl-ref/source/religion.h @@ -63,6 +63,8 @@ void dec_penance(god_type god, int val); bool did_god_conduct(conduct_type thing_done, int pgain, bool known = true, const monsters *victim = NULL); +void set_attack_conducts(const monsters *mon, god_conduct_trigger& conduct, + bool known = true); void excommunication(god_type new_god = GOD_NO_GOD); void gain_piety(int pgn); |