diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-31 23:33:49 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-31 23:33:49 +0000 |
| commit | b2a0f789b94558ed467b25ac5355eaf8b6558077 (patch) | |
| tree | 8ffec1f322123a7ab8b725dcc4c23cbfa40e95f5 /crawl-ref/source/religion.cc | |
| parent | 3344142e8b26c115585389049ca3a7f535fcab75 (diff) | |
| download | crawl-ref-b2a0f789b94558ed467b25ac5355eaf8b6558077.tar.gz crawl-ref-b2a0f789b94558ed467b25ac5355eaf8b6558077.zip | |
Fix 1962147: Move the comments on the food you eat at the end of DELAY_EAT.
Fix 1971216: Kills by confused undead use LIVING_KILLED_BY_SERVANT
instead because the message ("collateral kill") fits better
and, though it's basically a hack, the distinction does fit
somehow.
Fix 1914948: Tweak message when you resist a spell cast by an invisible
monster.
Fix 1946608: Print "Nothing appears to happen." if reading ?EWI when
unarmed.
I guess that's it, plus probably some more cleanup.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5378 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index aa41e1c14e..a1268d9d0b 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -1820,8 +1820,8 @@ std::string god_name( god_type which_god, bool long_name ) { case GOD_NO_GOD: return "No God"; case GOD_RANDOM: return "random"; - case GOD_ZIN: return (long_name ? "Zin the Law-Giver" : "Zin"); - case GOD_SHINING_ONE: return "The Shining One"; + case GOD_ZIN: return (long_name ? "Zin the Law-Giver" : "Zin"); + case GOD_SHINING_ONE: return "The Shining One"; case GOD_KIKUBAAQUDGHA: return "Kikubaaqudgha"; case GOD_YREDELEMNUL: return (long_name ? "Yredelemnul the Dark" : "Yredelemnul"); @@ -1833,8 +1833,8 @@ std::string god_name( god_type which_god, bool long_name ) case GOD_TROG: return (long_name ? "Trog the Wrathful" : "Trog"); case GOD_NEMELEX_XOBEH: return "Nemelex Xobeh"; case GOD_ELYVILON: return (long_name ? "Elyvilon the Healer" : "Elyvilon"); - case GOD_LUGONU: return (long_name ? "Lugonu the Unformed" : "Lugonu"); - case GOD_BEOGH: return (long_name ? "Beogh the Brigand" : "Beogh"); + case GOD_LUGONU: return (long_name ? "Lugonu the Unformed" : "Lugonu"); + case GOD_BEOGH: return (long_name ? "Beogh the Brigand" : "Beogh"); case GOD_XOM: if (!long_name) |