diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2013-03-04 11:44:15 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2013-03-04 11:45:22 -0600 |
| commit | 514453d2625af3a46a9d3f7620e86591d1877345 (patch) | |
| tree | 24415cfe70f2f81fe6b0a25af7337078ef5f86e8 /crawl-ref/source/godconduct.cc | |
| parent | 4d779cec5bdac4d1c5ccb6d3299425d466fb483c (diff) | |
| download | crawl-ref-514453d2625af3a46a9d3f7620e86591d1877345.tar.gz crawl-ref-514453d2625af3a46a9d3f7620e86591d1877345.zip | |
Add formatting fixes.
Diffstat (limited to 'crawl-ref/source/godconduct.cc')
| -rw-r--r-- | crawl-ref/source/godconduct.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crawl-ref/source/godconduct.cc b/crawl-ref/source/godconduct.cc index ced2b0b0ec..4b99230c21 100644 --- a/crawl-ref/source/godconduct.cc +++ b/crawl-ref/source/godconduct.cc @@ -137,7 +137,8 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, break; } - if (thing_done == DID_ATTACK_HOLY && victim + if (thing_done == DID_ATTACK_HOLY + && victim && !testbits(victim->flags, MF_NO_REWARD) && !testbits(victim->flags, MF_WAS_NEUTRAL)) { @@ -997,10 +998,10 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, if (you.religion == GOD_OKAWARU // currently no constructs and plants && (thing_done == DID_KILL_LIVING - || thing_done == DID_KILL_UNDEAD - || thing_done == DID_KILL_DEMON - || thing_done == DID_KILL_HOLY) - && ! god_hates_attacking_friend(you.religion, victim)) + || thing_done == DID_KILL_UNDEAD + || thing_done == DID_KILL_DEMON + || thing_done == DID_KILL_HOLY) + && !god_hates_attacking_friend(you.religion, victim)) { piety_change = get_fuzzied_monster_difficulty(victim); dprf("fuzzied monster difficulty: %4.2f", piety_change * 0.01); |