summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/it_use3.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-31 21:39:37 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-31 21:39:37 +0000
commit0179b500e318584289c2719994e2e744864cb9cb (patch)
tree33482fc332aa6ac26509da8c3a3c120e7ffacb45 /crawl-ref/source/it_use3.cc
parente1a0e734343b84f169d86ffc4ac85cc78f5c2753 (diff)
downloadcrawl-ref-0179b500e318584289c2719994e2e744864cb9cb.tar.gz
crawl-ref-0179b500e318584289c2719994e2e744864cb9cb.zip
More type safety.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8869 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/it_use3.cc')
-rw-r--r--crawl-ref/source/it_use3.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc
index 29ca64e595..e4dadc298b 100644
--- a/crawl-ref/source/it_use3.cc
+++ b/crawl-ref/source/it_use3.cc
@@ -453,14 +453,14 @@ bool evoke_wielded()
canned_msg( MSG_TOO_BERSERK );
return (false);
}
- else if (wield == -1)
+ else if (!you.weapon())
{
mpr("You aren't wielding anything!");
crawl_state.zero_turns_taken();
return (false);
}
- item_def& wpn = you.inv[wield];
+ item_def& wpn = *you.weapon();
bool unevokable = false;
// Check inscriptions.
@@ -480,7 +480,7 @@ bool evoke_wielded()
else
return (false);
}
- else if (is_fixed_artefact( wpn ))
+ else if (is_fixed_artefact(wpn))
{
switch (wpn.special)
{