diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-08 11:19:12 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-08 11:19:12 +0000 |
| commit | d4577487e64c62a629be512f5f21404e3192a0fe (patch) | |
| tree | 504eb853c918e5b2e46729f42ad86173470edc27 /crawl-ref/source/it_use3.cc | |
| parent | d5f262eb187ed2a96b0216103210c8ba8057d59c (diff) | |
| download | crawl-ref-d4577487e64c62a629be512f5f21404e3192a0fe.tar.gz crawl-ref-d4577487e64c62a629be512f5f21404e3192a0fe.zip | |
Apply tiles inscription fixes to trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9922 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/it_use3.cc')
| -rw-r--r-- | crawl-ref/source/it_use3.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc index b0b1d34fa5..a9d132fc8d 100644 --- a/crawl-ref/source/it_use3.cc +++ b/crawl-ref/source/it_use3.cc @@ -811,7 +811,10 @@ bool evoke_item(int slot) if (prompt_failed(slot)) return (false); } - ASSERT (slot >= 0); + else if (!check_warning_inscriptions(you.inv[slot], OPER_EVOKE)) + return (false); + + ASSERT(slot >= 0); const bool wielded = (you.equip[EQ_WEAPON] == slot); @@ -820,13 +823,9 @@ bool evoke_item(int slot) if (!item_is_evokable(item, false, false, true)) return (false); - // Check inscriptions. - if (!check_warning_inscriptions(item, OPER_EVOKE)) - return (false); - int power = 0; int pract = 0; // By how much Evocations is practised. - bool did_work = false; // Used for default "nothing happens" message. + bool did_work = false; // Used for default "nothing happens" message. bool unevokable = false; switch (item.base_type) |