From 968b72f7e415665bdb896fe3979f8049d69a930f Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Tue, 15 Jul 2008 13:27:09 +0000 Subject: Fix 2018325 (compiling with gcc 4.3) by applying the patch by nathanj439. Re-enable friendly pickup toggle for all characters and change wording to make it clearer it may have no effect. (Fixes 2018493.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6557 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/acr.cc | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) (limited to 'crawl-ref/source/acr.cc') diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index bf8fc64634..0a9eae96e5 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1785,21 +1785,21 @@ static void _print_friendly_pickup_setting(bool was_changed) if (you.friendly_pickup == FRIENDLY_PICKUP_NONE) { - mprf("Your allies are %sforbidden to pick up anything at all.", + mprf("Your intelligent, permanent allies are %sforbidden to pick up anything at all.", now.c_str()); } else if (you.friendly_pickup == FRIENDLY_PICKUP_FRIEND) { - mprf("Your allies may %sonly pick up items dropped by allies.", + mprf("Your intelligent, permanent allies may %sonly pick up items dropped by allies.", now.c_str()); } else if (you.friendly_pickup == FRIENDLY_PICKUP_ALL) { - mprf("Your allies may %spick up anything they need.", now.c_str()); + mprf("Your intelligent, permanent allies may %spick up anything they need.", now.c_str()); } else { - mprf("Your allies%s are collecting bugs!", now.c_str()); + mprf(MSGCH_ERROR, "Your allies%s are collecting bugs!", now.c_str()); } } @@ -1934,23 +1934,17 @@ void process_command( command_type cmd ) case CMD_TOGGLE_FRIENDLY_PICKUP: { -#ifndef WIZARD - if (!god_gives_permanent_followers(you.religion)) - { - mpr("I'm sorry, your allies won't ever be able to pick up items."); - if (Options.tutorial_left) - { - mpr("Only intelligent permanent allies may equip themselves, " - "and these two restrictions are only met by allies of the " - "followers of four gods in the pantheon: the Shining " - "One, Yredelemnul, Kikubaaqudgha, and Beogh.", - MSGCH_TUTORIAL); - } - break; - } -#endif // Toggle pickup mode for friendlies. _print_friendly_pickup_setting(false); + + if (Options.tutorial_left + && !god_gives_permanent_followers(you.religion)) + { + mpr("Only intelligent, permanent allies may equip themselves, " + "which excludes all types of zombies as well as enslaved and " + "summoned monsters.", MSGCH_TUTORIAL); + } + mpr("Change to (d)efault, (n)othing, (f)riend-dropped, or (a)ll? ", MSGCH_PROMPT); @@ -4068,9 +4062,7 @@ static bool _initialise(void) if (newc) // start a new game { - you.friendly_pickup = FRIENDLY_PICKUP_NONE; - if (god_gives_permanent_followers(you.religion)) - you.friendly_pickup = Options.default_friendly_pickup; + you.friendly_pickup = Options.default_friendly_pickup; // Mark items in inventory as of unknown origin. origin_set_inventory(origin_set_unknown); -- cgit v1.2.3-54-g00ecf