diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-03 20:31:32 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-03 20:31:32 +0000 |
| commit | af6cb48eda2b91fa76f8a1ad27a5dc1917a57870 (patch) | |
| tree | 5774d3cde3f4426b76a450d0511af3aeb912f912 /crawl-ref/source | |
| parent | b16a25f6b98805c5347eb9e56090e930c530495f (diff) | |
| download | crawl-ref-af6cb48eda2b91fa76f8a1ad27a5dc1917a57870.tar.gz crawl-ref-af6cb48eda2b91fa76f8a1ad27a5dc1917a57870.zip | |
Simplify again.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7371 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/religion.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/religion.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 5d7021983e..512c29a470 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2238,22 +2238,20 @@ void god_speaks(god_type god, const char *mesg) mpr(mesg, MSGCH_GOD, god); } -god_type do_god_vengeance(conduct_type thing_done, bool actual) +god_type do_god_vengeance(conduct_type thing_done) { god_type god = GOD_NO_GOD; if (thing_done == DID_DESTROY_ORCISH_IDOL) { god = GOD_BEOGH; - if (actual) - beogh_idol_revenge(); + beogh_idol_revenge(); } else if (thing_done == DID_KILL_HOLY || thing_done == DID_HOLY_KILLED_BY_SERVANT) { god = GOD_SHINING_ONE; - if (actual) - tso_holy_revenge(); + tso_holy_revenge(); } return (god); diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h index 222c3755cc..e0fe410e96 100644 --- a/crawl-ref/source/religion.h +++ b/crawl-ref/source/religion.h @@ -63,7 +63,7 @@ std::string get_god_dislikes(god_type which_god, bool verbose = false); void dec_penance(int val); void dec_penance(god_type god, int val); -god_type do_god_vengeance(conduct_type thing_done, bool actual = true); +god_type do_god_vengeance(conduct_type thing_done); bool did_god_conduct(conduct_type thing_done, int pgain, bool known = true, const monsters *victim = NULL); void set_attack_conducts(god_conduct_trigger conduct[3], const monsters *mon, |