diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-07 21:30:12 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-07 21:30:12 +0000 |
| commit | 88476ef9569929088137a21fcb4822ae7a83431a (patch) | |
| tree | 0d787ab237dd7e58fdecf051199721a803c072a6 /crawl-ref/source/misc.cc | |
| parent | 100c7dd207a48003e0af4834d94244fbded71cf9 (diff) | |
| download | crawl-ref-88476ef9569929088137a21fcb4822ae7a83431a.tar.gz crawl-ref-88476ef9569929088137a21fcb4822ae7a83431a.zip | |
Properly save friendly pickup setting as a player variable (rather than
options). This increases the minor version by 1. Also, tidy up the
checks of this settings.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4916 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/misc.cc')
| -rw-r--r-- | crawl-ref/source/misc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index b7fdba8714..dbe150e71f 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -1477,7 +1477,7 @@ static void set_entry_cause(entry_cause_type default_cause, if (crawl_state.is_god_acting()) { if (crawl_state.is_god_retribution()) - you.entry_cause = EC_GOD_RETRIUBTION; + you.entry_cause = EC_GOD_RETRIBUTION; else you.entry_cause = EC_GOD_ACT; @@ -2122,7 +2122,7 @@ void down_stairs( int old_level, dungeon_feature_type force_stair, if (newlevel) { // When entering a new level, reset friendly_pickup to default. - Options.friendly_pickup = Options.default_friendly_pickup; + you.friendly_pickup = Options.default_friendly_pickup; switch(you.level_type) { |