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
7X4LFGBYTBK5LKZH7HPYBUHHMHWFAT3NPKAMJHK54YL2ZO5ZIK2AC AIVXE6QBRVCZAASKQRZO6LBDGTYEYSSD2DZCWRX4VLSKE3GCNIDAC NDGNTJWFOIU5EYAJU75FRRUICLCVQAJJ65NJ33ZGWDEYZZECPQEAC KYVZGUJXV23ELA4CKPVQZO3NTJCODXMCWYAZJYWVWJVLPETNHLGQC KVBY4K2MCJZXNFVJZPKTYUXRXPH5LE6ZOJW4LTHOZPO6TD555IVQC K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC BINKDWGFGUPTOA7IE5KK4ZIELGU5WC3X47MYXOWU4X43EGAC5DUAC SKWBAGSAB625IIN4UP3NCPRX2H3KCPC2LULHS2A7JVRLO3EUBJDAC NO2HRD7RZS42S55UG4FQ5EFQDY6WYWKGIXHUKYLWF36HHE3VZ7WAC HAM54HXIO2245W6REO4RZDY2QMIH476AWWJSMYAMSYYNEBBJSHWAC APWL24FMDRVA6NXFFCGNP3Z3FJJ6WFSRWO4ESHEOVT7Z5JGXPUQQC F2YWDQUXULLS2WKLVMNEJKEGSGG2MPEREVI2RKH7ROS2YYKKMXHAC XE5FBYASPYLMBNHWKL5MRN7TQGIWR4O6PF72I7WXRTUJ7HS2O2LAC UEI5JAVCMN7Y2SACTEZPZSNFJWOJTC55G24Q6LKQCT4XNDH5ZQIAC VXWDDKBETFFMU7LMGN4UGB74NNKXW456KFJMWWEVOTWH35NZZZHAC 6MTXWT5SWRGXPDBRU5SQIPJRZD4GF5VZZGHSYGYBKENCTWFKCLAAC JGKYRZ34S3I23PMJX6IUBR7EHEFD6I4XXEGXNT7GKT2M2VIRBSMQC RPOZZWKG5GLPHVZZ7ZKMKS64ZMV2LDCQSARBJFJ6FZOTOKCQO7FAC 5JS3QSE3EIXSBVI4DATH2EIFD7QN3POAFEUM7MK4NRMPH5JOPAAQC if (god_gives_permanent_followers(you.religion)){// Enable ally pickup control for gods that give you permanent// followers.you.friendly_pickup = Options.default_friendly_pickup;}else{// With other gods, you can only get stupid (zombies!),// summoned, or charmed allies, so pickup control makes no// sense. Sorry about that!you.friendly_pickup = FRIENDLY_PICKUP_NONE;}
// Sort monsters by:// attitude// difficulty// type// brandbool // staticmonster_pane_info::less_than(const monster_pane_info& m1,const monster_pane_info& m2, bool zombified)
// Needed because gcc 4.3 sort does not like comparison functions that take// more than 2 arguments.bool monster_pane_info::less_than_wrapper(const monster_pane_info& m1,const monster_pane_info& m2){return monster_pane_info::less_than(m1, m2, true);}// Sort monsters by (in that order): attitude, difficulty, type, brandbool monster_pane_info::less_than(const monster_pane_info& m1,const monster_pane_info& m2, bool zombified)
#ifndef WIZARDif (!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
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;