diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-07 21:24:43 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-07 21:24:43 +0000 |
| commit | 6cd783423bef2d290172930c770c3f22e8e127ad (patch) | |
| tree | bbb6d8fde994d94c945d4264fb053675cb28d7c5 /crawl-ref/source/it_use3.cc | |
| parent | 22a9bad294c44f6dd86faea04e1b00ea7c6e31d6 (diff) | |
| download | crawl-ref-6cd783423bef2d290172930c770c3f22e8e127ad.tar.gz crawl-ref-6cd783423bef2d290172930c770c3f22e8e127ad.zip | |
* Fix double prompts for inscription warnings when clicking on the tiles
inventory.
* Change exclusions from buggy los back to full radius, so as not to
delay the release any further.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@9916 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 693e23ea59..252385d124 100644 --- a/crawl-ref/source/it_use3.cc +++ b/crawl-ref/source/it_use3.cc @@ -808,7 +808,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); @@ -817,13 +820,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) |