diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-01 21:38:06 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-01 21:38:06 +0000 |
commit | 33f39e1feb49c5f7ef0fc748e16195849627faf9 (patch) | |
tree | f3f8d209377cc52716735994388c50d75caa9827 /crawl-ref/source/item_use.cc | |
parent | 4eb30eb42d7983767085a9a7bb45556b9b1665e3 (diff) | |
download | crawl-ref-33f39e1feb49c5f7ef0fc748e16195849627faf9.tar.gz crawl-ref-33f39e1feb49c5f7ef0fc748e16195849627faf9.zip |
* Fix some issues with the new food colourings, and make it respect
Vampires' drinking habits.
* Allow other channels than MSGCH_TUTORIAL to use formatted strings
and use it to send a coloured string through the butcher prompt,
thus visibly setting off dangerous corpses. I'd like normal
corpses (no patterns in food_colouring.txt matching) not to be
highlighted at all, but they're currently shown in lightgrey, that
will have to be improved.
* Fix Vampire mutation screen displaying poison resistance wrongly.
* Add a new option force_more_message whose syntax is copied from
travel_stop_message. Any message containing a regex within this
listing will enforce a -More- prompt. By default, it's only
enabled for "You start to lose your buoyoncy."
* Tweak the messages for Kenku flying to fix 1823833.
* Make Xom be amused at players teleporting in a labyrinth or when
becoming (Near) Starving while in a labyrinth and with little food
at their disposal.
Yes, it's one of those "Something for everyone" commits. :D
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5416 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r-- | crawl-ref/source/item_use.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index d0c1b8e051..2db9c511e4 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -3541,10 +3541,13 @@ void drink( int slot ) if (slot != -1) item_slot = slot; else + { item_slot = prompt_invent_item( "Drink which item?", MT_INVLIST, OBJ_POTIONS, true, true, true, 0, NULL, OPER_QUAFF ); + } + if (item_slot == PROMPT_ABORT) { canned_msg( MSG_OK ); @@ -3570,8 +3573,8 @@ void drink( int slot ) // The "> 1" part is to reduce the amount of times that Xom is // stimulated when you are a low-level 1 trying your first unknown // potions on monsters. - const bool dangerous = - (player_in_a_dangerous_place() && you.experience_level > 1); + const bool dangerous = (player_in_a_dangerous_place() + && you.experience_level > 1); if (potion_effect(static_cast<potion_type>(you.inv[item_slot].sub_type), 40, alreadyknown)) |