From 2f2066f741111325b2510c6526b41b22dea93370 Mon Sep 17 00:00:00 2001
From: skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 15 Jun 2006 18:56:54 +0000
Subject: - Altered a bit how status_set_viewdata behaves in regards to
 Wedding/Xmas options. - Added back OPTION_XMAS, but the actual value is
 missing! - Corrected chrif_save so that the player is not set offline on
 map-change. - Added change-look support in pc_setoption when specifying
 OPTION_XMAS - Fixed clif_parse_RemoveOption removing all options instead of
 just Falcon/Cart/Peco

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7183 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/status.h | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'src/map/status.h')

diff --git a/src/map/status.h b/src/map/status.h
index 5a454c855..b02aeeec6 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -455,24 +455,25 @@ enum {
 #define OPT3_AURASHIELD 0x800 //Assumptio
 #define OPT3_HEAT 0x1000 //Warmth Skills
 
-#define OPTION_SIGHT 0x0001
-#define OPTION_HIDE 0x0002
-#define OPTION_CLOAK 0x0004
-#define OPTION_CART1 0x0008
-#define OPTION_FALCON 0x0010
-#define OPTION_RIDING 0x0020
-#define OPTION_INVISIBLE 0x0040
-#define OPTION_CART2 0x0080
-#define OPTION_CART3 0x0100
-#define OPTION_CART4 0x0200
-#define OPTION_CART5 0x0400
-#define OPTION_ORCISH 0x0800
-#define OPTION_WEDDING 0x1000
-#define OPTION_RUWACH 0x2000
-#define OPTION_CHASEWALK 0x4000
-#define OPTION_FLYING 0x8000
+#define OPTION_SIGHT 0x00000001
+#define OPTION_HIDE 0x00000002
+#define OPTION_CLOAK 0x00000004
+#define OPTION_CART1 0x00000008
+#define OPTION_FALCON 0x00000010
+#define OPTION_RIDING 0x00000020
+#define OPTION_INVISIBLE 0x00000040
+#define OPTION_CART2 0x00000080
+#define OPTION_CART3 0x00000100
+#define OPTION_CART4 0x00000200
+#define OPTION_CART5 0x00000400
+#define OPTION_ORCISH 0x00000800
+#define OPTION_WEDDING 0x00001000
+#define OPTION_RUWACH 0x00002000
+#define OPTION_CHASEWALK 0x00004000
+#define OPTION_FLYING 0x00008000
 //TODO: Get these Missing options...
-#define OPTION_SIGHTTRASHER 0x0001
+#define OPTION_SIGHTTRASHER 0x00010000
+#define OPTION_XMAS 0x0020000
 
 #define OPTION_CART (OPTION_CART1|OPTION_CART2|OPTION_CART3|OPTION_CART4|OPTION_CART5)
 
-- 
cgit v1.2.3-60-g2f50