- Added SC_KEEPING/SC_BARRIER to calc_flag in status_change_end

- Added Option constants for Carts, fixed OPTION_FLYING (it conflicts with OPTION_XMAS?)
- Updated clif.c to check for OPTION_WEDDING|OPTION_XMAS instead of view class to block attacks and skill usage.
- Removed struct pc_base_job and functions pc_calc_base_job/pc_calc_base_job2 which are no longer used anywhere (were long ago deprecated infavor of the new jobid system)
- Cleaned up change-cart code.
- Modified SC_XMAS to not change your view anymore and only set the proper option value (OPTION_XMAS)
- Cleaned up the code regarding char_gm reading.
- Changed the option field to unsigned short to make room for the higher values.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6229 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 8 insertions, 5 deletions

diff --git a/src/map/map.h b/src/map/map.h
index 7e133a516..525b7dc5e 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -241,18 +241,21 @@ enum {
 #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_XMAS	0x8000

 

-#define OPTION_FLYING 0x8000

-

+#define OPTION_FLYING 0x10000

 //TODO: Get these Missing options...

 #define OPTION_SIGHTTRASHER 0x0001

 

@@ -409,7 +412,7 @@ struct status_change {
 	struct status_change_entry data[MAX_STATUSCHANGE];

 	short count;

 	short opt1,opt2,opt3;

-	short option;

+	unsigned short option;

 };

 

 struct vending {