diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-01 20:47:44 -0500 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-01 20:47:44 -0500 |
| commit | 25e998d40eae95ba647fc2cd9e89c69a1d60f234 (patch) | |
| tree | 566f3bcf022f6818c33530c7dac8a0813f270b2d /crawl-ref/source/religion.cc | |
| parent | 38a99d5fb299818a3fa0dc79c9ddc5d0379aeb0a (diff) | |
| download | crawl-ref-25e998d40eae95ba647fc2cd9e89c69a1d60f234.tar.gz crawl-ref-25e998d40eae95ba647fc2cd9e89c69a1d60f234.zip | |
Fix compilation (oops).
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 6e729cbe23..ec4cd17ea8 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -7711,7 +7711,11 @@ bool god_likes_butchery(god_type god) || god == GOD_MAKHLEB || god == GOD_TROG || god == GOD_LUGONU +<<<<<<< HEAD + || (god == GOD_KIKUBAAQUDGHA && you.piety >= piety_breakpoint(4))); +======= || (god == GOD_KIKUBAAQUDGHA && you.piety >= piety_breakpoint(4)); +>>>>>>> 38a99d5fb299818a3fa0dc79c9ddc5d0379aeb0a } bool god_hates_butchery(god_type god) |