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/output.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/output.cc')
| -rw-r--r-- | crawl-ref/source/output.cc | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 2e9b77c446..1303d72551 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -899,8 +899,8 @@ static std::string _level_description_string_hud() short_name += make_stringf(":%d", player_branch_depth()); } // Indefinite articles - else if ( place.level_type == LEVEL_PORTAL_VAULT - || place.level_type == LEVEL_LABYRINTH) + else if (place.level_type == LEVEL_PORTAL_VAULT + || place.level_type == LEVEL_LABYRINTH) { if (you.level_type_name == "bazaar") short_name = "A Bazaar"; @@ -1481,16 +1481,8 @@ const char* itosym3(int stat) static const char *s_equip_slot_names[] = { - "Weapon", - "Cloak", - "Helmet", - "Gloves", - "Boots", - "Shield", - "Armour", - "Left Ring", - "Right Ring", - "Amulet", + "Weapon", "Cloak", "Helmet", "Gloves", "Boots", + "Shield", "Armour", "Left Ring", "Right Ring", "Amulet", }; const char *equip_slot_to_name(int equip) |