summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-02 03:21:30 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-02 03:21:30 +0000
commit09260e6bcf2de907c2568d849770854a6fe6635c (patch)
treefe06d091a0b24b2e168308417ce81d2e54b3faa7
parent086c382f4864497137a5d0a450918514eb1b9130 (diff)
downloadhercules-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
-rw-r--r--src/map/clif.c27
-rw-r--r--src/map/pc.h18
2 files changed, 26 insertions, 19 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 3c2e7e51d..e0524711e 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -2764,25 +2764,24 @@ void clif_updatestatus(struct map_session_data *sd,int type)
WFIFOL(fd,4)=pc_leftside_atk(sd);
break;
case SP_DEF1:
- WFIFOL(fd,4)=sd->battle_status.def;
+ WFIFOL(fd,4)=pc_leftside_def(sd);
break;
case SP_MDEF1:
- WFIFOL(fd,4)=sd->battle_status.mdef;
+ WFIFOL(fd,4)=pc_leftside_mdef(sd);
break;
case SP_ATK2:
WFIFOL(fd,4)=pc_rightside_atk(sd);
break;
case SP_DEF2:
- WFIFOL(fd,4)=sd->battle_status.def2;
+ WFIFOL(fd,4)=pc_rightside_def(sd);
break;
- case SP_MDEF2:
- {
- //negative check (in case you have something like Berserk active)
- int mdef2 = sd->battle_status.mdef2 - (sd->battle_status.vit>>1);
+ case SP_MDEF2: {
+ //negative check (in case you have something like Berserk active)
+ int mdef2 = pc_rightside_mdef(sd);
- WFIFOL(fd,4)= ( mdef2 < 0 ) ? 0 : mdef2;
+ WFIFOL(fd,4)= ( mdef2 < 0 ) ? 0 : mdef2;
+ }
break;
- }
case SP_CRITICAL:
WFIFOL(fd,4)=sd->battle_status.cri/10;
break;
@@ -3123,10 +3122,10 @@ void clif_initialstatus(struct map_session_data *sd)
WBUFW(buf,18) = pc_rightside_atk(sd);
WBUFW(buf,20) = sd->battle_status.matk_max;
WBUFW(buf,22) = sd->battle_status.matk_min;
- WBUFW(buf,24) = sd->battle_status.def; // def
- WBUFW(buf,26) = sd->battle_status.def2;
- WBUFW(buf,28) = sd->battle_status.mdef; // mdef
- mdef2 = sd->battle_status.mdef2 - (sd->battle_status.vit>>1);
+ WBUFW(buf,24) = pc_leftside_def(sd);
+ WBUFW(buf,26) = pc_rightside_def(sd);
+ WBUFW(buf,28) = pc_leftside_mdef(sd);
+ mdef2 = pc_rightside_mdef(sd);
WBUFW(buf,30) = ( mdef2 < 0 ) ? 0 : mdef2; //Negative check for Frenzy'ed characters.
WBUFW(buf,32) = sd->battle_status.hit;
WBUFW(buf,34) = sd->battle_status.flee;
@@ -10645,7 +10644,7 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd)
}
pc_delinvincibletimer(sd);
-
+
if( skilllv )
unit_skilluse_id(&sd->bl, target_id, skillnum, skilllv);
}
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_);