- 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, 0 insertions, 8 deletions

diff --git a/src/map/pc.h b/src/map/pc.h
index 4a96893a6..9513bd176 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -212,14 +212,6 @@ int pc_set_gm_level(int account_id, int level);
 void pc_setstand(struct map_session_data *sd);

 int pc_candrop(struct map_session_data *sd,int item_id);

 

-struct pc_base_job{

-	int job; //職業、ただし転生職や養子職の場合は元の職業を返す(廃プリ→プリ)

-	int type; //ノビ 0, 一次職 1, 二次職 2, スパノビ 3

-	int upper; //通常 0, 転生 1, 養子 2

-};

-

-struct pc_base_job pc_calc_base_job(int b_class);//転生や養子職の元の職業を返す

-int pc_calc_base_job2(int b_class);	// Celest

 int pc_jobid2mapid(unsigned short b_class);	// Skotlex

 int pc_mapid2jobid(unsigned short class_, int sex);	// Skotlex