diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-02 03:21:30 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-02 03:21:30 +0000 |
| commit | 09260e6bcf2de907c2568d849770854a6fe6635c (patch) | |
| tree | fe06d091a0b24b2e168308417ce81d2e54b3faa7 /src/map/pc.h | |
| parent | 086c382f4864497137a5d0a450918514eb1b9130 (diff) | |
| download | hercules-09260e6bcf2de907c2568d849770854a6fe6635c.tar.gz hercules-09260e6bcf2de907c2568d849770854a6fe6635c.tar.bz2 hercules-09260e6bcf2de907c2568d849770854a6fe6635c.tar.xz hercules-09260e6bcf2de907c2568d849770854a6fe6635c.zip | |
Fixed bugreport:5660 DEF and MDEF now display in its proper renewal fields (under renewal mode)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16035 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index b1677a3a6..c171b28e3 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -641,13 +641,21 @@ enum e_pc_permission { || ( (class_) >= JOB_KAGEROU && (class_) < JOB_MAX ) \ ) -// clientside atk display macros (values to the left/right of the "+") +// clientside display macros (values to the left/right of the "+") #ifdef RENEWAL -#define pc_leftside_atk(sd) ((sd)->battle_status.batk) -#define pc_rightside_atk(sd) ((sd)->battle_status.rhw.atk + (sd)->battle_status.lhw.atk + (sd)->battle_status.rhw.atk2 + (sd)->battle_status.lhw.atk2) + #define pc_leftside_atk(sd) ((sd)->battle_status.batk) + #define pc_rightside_atk(sd) ((sd)->battle_status.rhw.atk + (sd)->battle_status.lhw.atk + (sd)->battle_status.rhw.atk2 + (sd)->battle_status.lhw.atk2) + #define pc_leftside_def(sd) ((sd)->battle_status.def2) + #define pc_rightside_def(sd) ((sd)->battle_status.def) + #define pc_leftside_mdef(sd) ( (sd)->battle_status.mdef2 - ((sd)->battle_status.vit>>1) ) + #define pc_rightside_mdef(sd) ((sd)->battle_status.mdef) #else -#define pc_leftside_atk(sd) ((sd)->battle_status.batk + (sd)->battle_status.rhw.atk + (sd)->battle_status.lhw.atk) -#define pc_rightside_atk(sd) ((sd)->battle_status.rhw.atk2 + (sd)->battle_status.lhw.atk2) + #define pc_leftside_atk(sd) ((sd)->battle_status.batk + (sd)->battle_status.rhw.atk + (sd)->battle_status.lhw.atk) + #define pc_rightside_atk(sd) ((sd)->battle_status.rhw.atk2 + (sd)->battle_status.lhw.atk2) + #define pc_leftside_def(sd) ((sd)->battle_status.def) + #define pc_rightside_def(sd) ((sd)->battle_status.def2) + #define pc_leftside_mdef(sd) ((sd)->battle_status.mdef) + #define pc_rightside_mdef(sd) ( (sd)->battle_status.mdef2 - ((sd)->battle_status.vit>>1) ) #endif int pc_class2idx(int class_); |