summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells3.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-31 23:33:49 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-31 23:33:49 +0000
commitb2a0f789b94558ed467b25ac5355eaf8b6558077 (patch)
tree8ffec1f322123a7ab8b725dcc4c23cbfa40e95f5 /crawl-ref/source/spells3.cc
parent3344142e8b26c115585389049ca3a7f535fcab75 (diff)
downloadcrawl-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/spells3.cc')
-rw-r--r--crawl-ref/source/spells3.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index fc80ab2600..597e5a8887 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -128,10 +128,10 @@ bool remove_curse(bool suppress_msg)
int loopy = 0; // general purpose loop variable {dlb}
bool success = false; // whether or not curse(s) removed {dlb}
- // special "wield slot" case - see if you can figure out why {dlb}:
- // because only cursed weapons in hand only count as cursed -- bwr
+ // Special "wield slot" case - see if you can figure out why {dlb}:
+ // ... because only cursed weapons in hand count as cursed -- bwr
if (you.equip[EQ_WEAPON] != -1
- && you.inv[you.equip[EQ_WEAPON]].base_type == OBJ_WEAPONS)
+ && you.inv[you.equip[EQ_WEAPON]].base_type == OBJ_WEAPONS)
{
if (item_cursed( you.inv[you.equip[EQ_WEAPON]] ))
{
@@ -141,8 +141,8 @@ bool remove_curse(bool suppress_msg)
}
}
- // everything else uses the same paradigm - are we certain?
- // what of artefact rings and amulets? {dlb}:
+ // Everything else uses the same paradigm - are we certain?
+ // What of artefact rings and amulets? {dlb}:
for (loopy = EQ_CLOAK; loopy < NUM_EQUIP; loopy++)
{
if (you.equip[loopy] != -1 && item_cursed(you.inv[you.equip[loopy]]))
@@ -152,7 +152,7 @@ bool remove_curse(bool suppress_msg)
}
}
- // messaging output {dlb}:
+ // Messaging output. {dlb}:
if (!suppress_msg)
{
if (success)