- 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, 2 insertions, 1 deletions

diff --git a/src/common/mmo.h b/src/common/mmo.h
index 99fb76c40..2b940de6b 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -183,7 +183,8 @@ struct mmo_charstatus {
 	short class_;

 	unsigned short status_point,skill_point;

 	int hp,max_hp,sp,max_sp;

-	short option,manner;

+	unsigned short option;

+	short manner;

 	unsigned char karma;

 	short hair,hair_color,clothes_color;

 	int party_id,guild_id,pet_id;