diff options
| author | Haru <haru@dotalux.com> | 2015-01-20 04:36:08 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-01-20 04:41:33 +0100 |
| commit | 4ae2b9b72dd4fce3d7a7778222d1c39abbb564a4 (patch) | |
| tree | dab9d12a6a4b95a37598e27e6e86d6047360d61b /src/map/pc.h | |
| parent | 03709c136ad300be631adfd38dc36c2433bda718 (diff) | |
| download | hercules-4ae2b9b72dd4fce3d7a7778222d1c39abbb564a4.tar.gz hercules-4ae2b9b72dd4fce3d7a7778222d1c39abbb564a4.tar.bz2 hercules-4ae2b9b72dd4fce3d7a7778222d1c39abbb564a4.tar.xz hercules-4ae2b9b72dd4fce3d7a7778222d1c39abbb564a4.zip | |
Minor fixes and tweaks suggested by cppcheck
- Variable scopes reduced
- Parenthesized ambiguous expressions
- Removed or added NULL checks where (un)necessary
- Corrected format strings
- Fixed typos potentially leading to bugs
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index 152701119..b7839147d 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -599,7 +599,14 @@ struct map_session_data { #define pc_isinvisible(sd) ( (sd)->sc.option&OPTION_INVISIBLE ) #define pc_is50overweight(sd) ( (sd)->weight*100 >= (sd)->max_weight*battle->bc->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_&MAPID_UPPERMASK) == MAPID_REBELLION || ((sd)->class_&MAPID_THIRDMASK) == MAPID_SUPER_NOVICE_E) ? battle->bc->max_extended_parameter : (sd)->class_&JOBL_THIRD ? ((sd)->class_&JOBL_BABY ? battle->bc->max_baby_third_parameter : battle->bc->max_third_parameter) : ((sd)->class_&JOBL_BABY ? battle->bc->max_baby_parameter : battle->bc->max_parameter) ) +#define pc_maxparameter(sd) ( \ + ( ((sd)->class_&MAPID_UPPERMASK) == MAPID_KAGEROUOBORO \ + || ((sd)->class_&MAPID_UPPERMASK) == MAPID_REBELLION \ + || ((sd)->class_&MAPID_THIRDMASK) == MAPID_SUPER_NOVICE_E \ + ) ? battle->bc->max_extended_parameter : ((sd)->class_&JOBL_THIRD) ? \ + (((sd)->class_&JOBL_BABY) ? battle->bc->max_baby_third_parameter : battle->bc->max_third_parameter ) : \ + (((sd)->class_&JOBL_BABY) ? battle->bc->max_baby_parameter : battle->bc->max_parameter) \ + ) /// Generic check for mounts #define pc_hasmount(sd) ( (sd)->sc.option&(OPTION_RIDING|OPTION_WUGRIDER|OPTION_DRAGON|OPTION_MADOGEAR) ) /// Knight classes Peco / Gryphon |