[1836426] Fixed penance message sequence for beams, clamped penance messages at one per turn. (Penance message sequence for melee combat not fixed yet.)

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2926 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 27 insertions, 0 deletions

diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h
index 15b5d843cb..bce7b64b39 100644
--- a/crawl-ref/source/religion.h
+++ b/crawl-ref/source/religion.h
@@ -16,6 +16,7 @@
 
 #include "enum.h"
 #include "ouch.h"
+#include "externs.h"
 
 #define MAX_PIETY 200
 
@@ -28,8 +29,10 @@ int piety_breakpoint(int i);
 const char *god_name(god_type which_god, bool long_name = false); //mv
 void dec_penance(int val);
 void dec_penance(god_type god, int val);
+
 bool did_god_conduct(conduct_type thing_done, int pgain, bool known = true,
                      const actor *victim = NULL);
+
 void excommunication(void);
 void gain_piety(int pgn);
 void god_speaks(god_type god, const char *mesg );
@@ -56,7 +59,31 @@ bool ely_destroy_weapons();
 bool trog_burn_books();
 bool tso_stab_safe_monster(const actor *act);
 
+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);
 
+// 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