summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/religion.h
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/religion.h')
-rw-r--r--crawl-ref/source/religion.h51
1 files changed, 25 insertions, 26 deletions
diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h
index 1ca01f75f1..9d3f4d3486 100644
--- a/crawl-ref/source/religion.h
+++ b/crawl-ref/source/religion.h
@@ -29,6 +29,31 @@ enum harm_protection_type
NUM_HPTS
};
+// Calls did_god_conduct() when the object goes out of scope.
+struct god_conduct_trigger
+{
+ conduct_type conduct;
+ int pgain;
+ bool known;
+ bool enabled;
+ std::auto_ptr<monsters> victim;
+
+ god_conduct_trigger(conduct_type c = NUM_CONDUCTS,
+ int pg = 0,
+ bool kn = true,
+ const monsters *vict = NULL);
+
+ void set(conduct_type c = NUM_CONDUCTS,
+ int pg = 0,
+ bool kn = true,
+ const monsters *vict = NULL);
+
+ ~god_conduct_trigger();
+};
+
+bool is_evil_god(god_type god);
+bool is_good_god(god_type god);
+bool is_chaotic_god(god_type god);
bool is_priest_god(god_type god);
void simple_god_message( const char *event, god_type which_deity = GOD_NO_GOD );
int piety_breakpoint(int i);
@@ -83,30 +108,4 @@ bool bless_follower(monsters *follower = NULL,
bool god_hates_attacking_friend(god_type god, const actor *fr);
-bool is_evil_god(god_type god);
-bool is_good_god(god_type god);
-bool is_chaotic_god(god_type god);
-
-// Calls did_god_conduct when the object goes out of scope.
-struct god_conduct_trigger
-{
- conduct_type conduct;
- int pgain;
- bool known;
- bool enabled;
- std::auto_ptr<monsters> victim;
-
- god_conduct_trigger(conduct_type c = NUM_CONDUCTS,
- int pg = 0,
- bool kn = true,
- const monsters *vict = NULL);
-
- void set(conduct_type c = NUM_CONDUCTS,
- int pg = 0,
- bool kn = true,
- const monsters *vict = NULL);
-
- ~god_conduct_trigger();
-};
-
#endif