diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-05 16:46:35 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-05 16:46:35 +0000 |
commit | 8b6403164380ecbc2a0a16b15757fd2cdce548eb (patch) | |
tree | 2f6d8bf84b4be0b82aad5ef055516e758e505b16 /crawl-ref/source/religion.h | |
parent | cd9d13b92dee71ff7671c10e69e4508b7554ff69 (diff) | |
download | crawl-ref-8b6403164380ecbc2a0a16b15757fd2cdce548eb.tar.gz crawl-ref-8b6403164380ecbc2a0a16b15757fd2cdce548eb.zip |
Merge trunk back into 0.2 for 0.2.2.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1227 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.h')
-rw-r--r-- | crawl-ref/source/religion.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h index 0a8d565cca..5272a1383e 100644 --- a/crawl-ref/source/religion.h +++ b/crawl-ref/source/religion.h @@ -28,7 +28,8 @@ void gain_piety(char pgn); void god_speaks( int god, const char *mesg ); void lose_piety(char pgn); void offer_corpse(int corpse); -void pray(void); +std::string god_prayer_reaction(); +void pray(); void handle_god_time(void); char god_colour(char god); void god_pitch(unsigned char which_god); |