diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-30 03:37:17 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-30 03:37:17 +0000 |
| commit | d94c7e9f87b997f6ed27fda3252b70ec461f5288 (patch) | |
| tree | 40627f5f88ba070b0d4f3db57a80ec2bee2cb509 /crawl-ref/source/religion.cc | |
| parent | b65a8ee385dade757db63b3f2cbc8e538ce8400d (diff) | |
| download | crawl-ref-d94c7e9f87b997f6ed27fda3252b70ec461f5288.tar.gz crawl-ref-d94c7e9f87b997f6ed27fda3252b70ec461f5288.zip | |
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6232 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 851dc78e81..8c0c97ca2a 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -441,11 +441,6 @@ bool is_chaotic_god(god_type god) || god == GOD_MAKHLEB); } -bool is_lawful_god(god_type god) -{ - return (god == GOD_ZIN); -} - bool is_priest_god(god_type god) { return (god == GOD_ZIN @@ -4273,7 +4268,7 @@ static bool _chaotic_beings_on_level_attitude_change() // If you worship Zin, you make all friendly and good neutral // chaotic beings hostile. - if (is_lawful_god(you.religion) && mons_wont_attack(monster)) + if (you.religion == GOD_ZIN && mons_wont_attack(monster)) { monster->attitude = ATT_HOSTILE; monster->del_ench(ENCH_CHARM, true); @@ -5508,7 +5503,7 @@ void god_pitch(god_type which_god) // hostile. if (is_good_god(you.religion) && _evil_beings_attitude_change()) mpr("Your evil allies forsake you.", MSGCH_MONSTER_ENCHANT); - if (is_lawful_god(you.religion) && _chaotic_beings_attitude_change()) + if (you.religion == GOD_ZIN && _chaotic_beings_attitude_change()) mpr("Your chaotic allies forsake you.", MSGCH_MONSTER_ENCHANT); if (you.religion == GOD_TROG && _magic_users_attitude_change()) mpr("Your magic-using allies forsake you.", MSGCH_MONSTER_ENCHANT); @@ -5570,7 +5565,7 @@ bool god_hates_your_god(god_type god, return (true); // Zin hates Xom and Makhleb. - if (is_lawful_god(god) && is_chaotic_god(your_god)) + if (god == GOD_ZIN && is_chaotic_god(your_god)) return (true); return (is_evil_god(your_god)); @@ -5586,7 +5581,7 @@ std::string god_hates_your_god_reaction(god_type god, return ""; // Zin hates Xom and Makhleb. - if (is_lawful_god(god) && is_chaotic_god(your_god)) + if (god == GOD_ZIN && is_chaotic_god(your_god)) return " for chaos"; if (is_evil_god(your_god)) |