diff options
| author | shennetsind <notind@gmail.com> | 2013-09-28 04:23:56 -0700 |
|---|---|---|
| committer | shennetsind <notind@gmail.com> | 2013-09-28 04:23:56 -0700 |
| commit | 71af4a3caa5c09d38fc6ea99ca3ca3bc3cc280ce (patch) | |
| tree | 2c46f0a5ac28f67931433de0f3b18dd0aa6e7d73 /src/map/pc.h | |
| parent | 346ea5f138e5baee36cf1e986c12fff84277f4ca (diff) | |
| parent | 7d8f83d8ff360df4c2b960933c015117eb9d776b (diff) | |
| download | hercules-71af4a3caa5c09d38fc6ea99ca3ca3bc3cc280ce.tar.gz hercules-71af4a3caa5c09d38fc6ea99ca3ca3bc3cc280ce.tar.bz2 hercules-71af4a3caa5c09d38fc6ea99ca3ca3bc3cc280ce.tar.xz hercules-71af4a3caa5c09d38fc6ea99ca3ca3bc3cc280ce.zip | |
Merge pull request #161 from shenhuyong/master
Added full support for the Rebellion.
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index d384e0145..69bcdea8d 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -634,7 +634,7 @@ enum equip_pos { #define pc_isinvisible(sd) ( (sd)->sc.option&OPTION_INVISIBLE ) #define pc_is50overweight(sd) ( (sd)->weight*100 >= (sd)->max_weight*battle_config.natural_heal_weight_rate ) #define pc_is90overweight(sd) ( (sd)->weight*10 >= (sd)->max_weight*9 ) -#define pc_maxparameter(sd) ( ((((sd)->class_&MAPID_UPPERMASK) == MAPID_KAGEROUOBORO) || (sd)->class_&JOBL_THIRD ? ((sd)->class_&JOBL_BABY ? battle_config.max_baby_third_parameter : battle_config.max_third_parameter) : ((sd)->class_&JOBL_BABY ? battle_config.max_baby_parameter : battle_config.max_parameter)) ) +#define pc_maxparameter(sd) ( ((((sd)->class_&MAPID_UPPERMASK) == MAPID_KAGEROUOBORO) || (((sd)->class_&MAPID_UPPERMASK) == MAPID_REBELLION) || (sd)->class_&JOBL_THIRD ? ((sd)->class_&JOBL_BABY ? battle_config.max_baby_third_parameter : battle_config.max_third_parameter) : ((sd)->class_&JOBL_BABY ? battle_config.max_baby_parameter : battle_config.max_parameter)) ) /** * Ranger **/ @@ -660,7 +660,8 @@ enum equip_pos { || ( (class_) >= JOB_RUNE_KNIGHT && (class_) <= JOB_MECHANIC_T2 ) \ || ( (class_) >= JOB_BABY_RUNE && (class_) <= JOB_BABY_MECHANIC2 ) \ || ( (class_) >= JOB_SUPER_NOVICE_E && (class_) <= JOB_SUPER_BABY_E ) \ -|| ( (class_) >= JOB_KAGEROU && (class_) < JOB_MAX ) \ +|| ( (class_) >= JOB_KAGEROU && (class_) <= JOB_OBORO ) \ +|| ( (class_) >= JOB_REBELLION && (class_) < JOB_MAX ) \ ) #define pcdb_checkid(class_) pcdb_checkid_sub((unsigned int)class_) |