diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-29 12:57:33 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-29 12:57:33 +0000 |
| commit | 942a2a13a9bbe4672247b37e58a53abfc4ca4db5 (patch) | |
| tree | ad0535ec1aae75b8898eaa74b29836d53a2e157b /crawl-ref/source/it_use2.h | |
| parent | e5713cc0c97db9275c105a0a5a9e76c738fd0d25 (diff) | |
| download | crawl-ref-942a2a13a9bbe4672247b37e58a53abfc4ca4db5.tar.gz crawl-ref-942a2a13a9bbe4672247b37e58a53abfc4ca4db5.zip | |
Clean up potion effects as per [2544231]; get rid of the "power == 40 means
it's a potion" hack.
Fix security issue in dumping code (never dump a string without using %s.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8846 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/it_use2.h')
| -rw-r--r-- | crawl-ref/source/it_use2.h | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/crawl-ref/source/it_use2.h b/crawl-ref/source/it_use2.h index 8ae3e6002c..80bc1bf5b3 100644 --- a/crawl-ref/source/it_use2.h +++ b/crawl-ref/source/it_use2.h @@ -12,29 +12,13 @@ #include "externs.h" - -/* *********************************************************************** - * called from: ability - beam - decks - item_use - misc - religion - - * spell - spells - spells1 - * *********************************************************************** */ -bool potion_effect(potion_type pot_eff, int pow, bool was_known = true); - -/* *********************************************************************** - * called from: item_use - * *********************************************************************** */ -void unuse_randart(unsigned char unw); +// drank_it should be true for real potion effects (as opposed +// to abilities which duplicate such effects.) +bool potion_effect(potion_type pot_eff, int pow, + bool drank_it = false, bool was_known = true); void unuse_randart(const item_def &item); - -/* *********************************************************************** - * called from: item_use - transfor - * *********************************************************************** */ -void unwear_armour(char unw); - - -/* *********************************************************************** - * called from: decks - it_use3 - item_use - items - spells3 - transfor - * *********************************************************************** */ +void unwear_armour(int slot); bool unwield_item(bool showMsgs = true); #endif |