From 88476ef9569929088137a21fcb4822ae7a83431a Mon Sep 17 00:00:00 2001
From: j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Wed, 7 May 2008 21:30:12 +0000
Subject: 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
---
 crawl-ref/source/enum.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'crawl-ref/source/enum.h')

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index b73aca2c8e..7794bbd4ae 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -1372,6 +1372,7 @@ enum level_area_type                   // you.level_type
     NUM_LEVEL_AREA_TYPES
 };
 
+// reasons for entering the Abyss
 enum entry_cause_type
 {
     EC_UNKNOWN,
@@ -1379,7 +1380,7 @@ enum entry_cause_type
     EC_SELF_RISKY,    // i.e., wielding an id'd distorion weapon
     EC_SELF_ACCIDENT, // i.e., wielding an un-id'd distortion weapon
     EC_MISCAST,
-    EC_GOD_RETRIUBTION,
+    EC_GOD_RETRIBUTION,
     EC_GOD_ACT, // Xom sending the player somewhere for amusement
     EC_MONSTER,
     NUM_ENTRY_CAUSE_TYPES
@@ -2723,6 +2724,13 @@ enum unique_item_status_type
     UNIQ_LOST_IN_ABYSS = 2
 };
 
+enum friendly_pickup_type
+{
+    FRIENDLY_PICKUP_NONE = 0,
+    FRIENDLY_PICKUP_FRIEND,
+    FRIENDLY_PICKUP_ALL
+};
+
 #ifdef WIZARD
 
 enum wizard_option_type
-- 
cgit v1.2.3-54-g00ecf