diff options
| author | shennetsind <ind@henn.et> | 2013-07-11 14:32:05 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-07-11 14:32:05 -0300 |
| commit | 0a1c06b267e549877e0617fe19963b5b7c8c937c (patch) | |
| tree | 228ab350473b07154d4bcf0ead0d93f163f6d6a8 /src/map/pc.h | |
| parent | e3761a81ba4c941ba04a2b6b1f161a6e1402ebe9 (diff) | |
| parent | 0683c5f38cdefa3735c3d0abc1b74abaa68cf5c4 (diff) | |
| download | hercules-0a1c06b267e549877e0617fe19963b5b7c8c937c.tar.gz hercules-0a1c06b267e549877e0617fe19963b5b7c8c937c.tar.bz2 hercules-0a1c06b267e549877e0617fe19963b5b7c8c937c.tar.xz hercules-0a1c06b267e549877e0617fe19963b5b7c8c937c.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index 7f0e8cf46..58dd85083 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -327,7 +327,6 @@ struct map_session_data { int fixcastrate,varcastrate; int add_fixcast,add_varcast; int ematk; // matk bonus from equipment - int eatk; // atk bonus from equipment } bonus; // zeroed vars end here. int castrate,delayrate,hprate,sprate,dsprate; @@ -655,7 +654,7 @@ enum equip_pos { // 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 + (sd)->bonus.eatk ) + #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 + (sd)->battle_status.equip_atk ) #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) |