From a4cf0d15ce8bae7dbefe95b5709a403ab2f1ccaa Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Fri, 24 Apr 2009 15:45:20 +0000 Subject: Change Options.autopickup_on from boolean to 3-state: 1 (autopick up), 0 (autopickup off), -1 (autopickup turned off automatically). Only in the latter case does killing an invisible monster turn autopickup (back) on. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9691 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/beam.cc | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'crawl-ref/source/beam.cc') diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 2110903319..c2e2a810e9 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -4948,18 +4948,7 @@ mon_resist_type bolt::apply_enchantment_to_monster(monsters* mon) : "and vanishes!" ); if (!player_monster_visible(mon)) - { - // Also turn off autopickup. - Options.autopickup_on = false; - mpr("Deactivating autopickup; reactivate with Ctrl-A.", - MSGCH_WARN); - - if (Options.tutorial_left) - { - learned_something_new(TUT_INVISIBLE_DANGER); - Options.tut_seen_invisible = you.num_turns; - } - } + autotoggle_autopickup(true); } obvious_effect = true; -- cgit v1.2.3-54-g00ecf