diff options
| author | Chris Campbell <chriscampbell89@gmail.com> | 2013-01-20 16:50:22 +0000 |
|---|---|---|
| committer | Chris Campbell <chriscampbell89@gmail.com> | 2013-01-20 16:50:22 +0000 |
| commit | d67fa0f8d4932d2f89d943358a0481117e960181 (patch) | |
| tree | 5f2b5f033cefa6ec5ebb45a8d8702e8bc37312c1 /crawl-ref/source/godconduct.cc | |
| parent | d48edd72c0b6a02df44e51de3f8f777e23d62532 (diff) | |
| parent | ba7d4b7e00b62146a6ee2a2addbb6033ae714127 (diff) | |
| download | crawl-ref-d67fa0f8d4932d2f89d943358a0481117e960181.tar.gz crawl-ref-d67fa0f8d4932d2f89d943358a0481117e960181.zip | |
Merge branch 'vehumet'
Diffstat (limited to 'crawl-ref/source/godconduct.cc')
| -rw-r--r-- | crawl-ref/source/godconduct.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crawl-ref/source/godconduct.cc b/crawl-ref/source/godconduct.cc index b6b11f4952..ced2b0b0ec 100644 --- a/crawl-ref/source/godconduct.cc +++ b/crawl-ref/source/godconduct.cc @@ -398,6 +398,7 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, switch (you.religion) { case GOD_SHINING_ONE: + case GOD_VEHUMET: case GOD_MAKHLEB: case GOD_TROG: case GOD_KIKUBAAQUDGHA: @@ -529,6 +530,7 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, case GOD_YREDELEMNUL: case GOD_KIKUBAAQUDGHA: case GOD_TROG: + case GOD_VEHUMET: case GOD_MAKHLEB: case GOD_BEOGH: case GOD_LUGONU: @@ -616,7 +618,6 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, { case GOD_YREDELEMNUL: case GOD_KIKUBAAQUDGHA: - case GOD_VEHUMET: case GOD_MAKHLEB: case GOD_BEOGH: case GOD_LUGONU: @@ -635,7 +636,6 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, case DID_LIVING_KILLED_BY_SERVANT: switch (you.religion) { - case GOD_VEHUMET: case GOD_MAKHLEB: case GOD_TROG: case GOD_BEOGH: @@ -655,7 +655,6 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, case DID_UNDEAD_KILLED_BY_UNDEAD_SLAVE: switch (you.religion) { - case GOD_VEHUMET: case GOD_MAKHLEB: case GOD_BEOGH: case GOD_LUGONU: @@ -675,7 +674,6 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, switch (you.religion) { case GOD_SHINING_ONE: - case GOD_VEHUMET: case GOD_MAKHLEB: case GOD_BEOGH: case GOD_LUGONU: |