diff options
| author | shennetsind <ind@henn.et> | 2013-07-04 16:12:38 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-07-04 16:12:38 -0300 |
| commit | fb945b7b7eb17f707215ef2b4f1e775ed430b012 (patch) | |
| tree | 907838da968f711033da17f26c6f55191e1c2ac3 /src/config | |
| parent | 6570776ff8b52b141b9f0b581d6fd6fa06117db5 (diff) | |
| parent | b9889903e89bd4127c7503a512cfe215b9ccc740 (diff) | |
| download | hercules-fb945b7b7eb17f707215ef2b4f1e775ed430b012.tar.gz hercules-fb945b7b7eb17f707215ef2b4f1e775ed430b012.tar.bz2 hercules-fb945b7b7eb17f707215ef2b4f1e775ed430b012.tar.xz hercules-fb945b7b7eb17f707215ef2b4f1e775ed430b012.zip | |
Merge branch 'master' of github.com:Earisu/Hercules into Earisu-master
Adjusting for merge.
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/battle.c
src/map/status.c
src/map/status.h
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/const.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/config/const.h b/src/config/const.h index b51db97e5..bee8783f8 100644 --- a/src/config/const.h +++ b/src/config/const.h @@ -75,15 +75,15 @@ /* Renewal's dmg level modifier, used as a macro for a easy way to turn off. */ #ifdef RENEWAL_LVDMG #define RE_LVL_DMOD(val) \ - if( status_get_lv(src) > 100 && val > 0 ) \ - skillratio = skillratio * status_get_lv(src) / val; + if( iStatus->get_lv(src) > 100 && val > 0 ) \ + skillratio = skillratio * iStatus->get_lv(src) / val; #define RE_LVL_MDMOD(val) \ - if( status_get_lv(src) > 100 && val > 0) \ - md.damage = md.damage * status_get_lv(src) / val; + if( iStatus->get_lv(src) > 100 && val > 0) \ + md.damage = md.damage * iStatus->get_lv(src) / val; /* ranger traps special */ #define RE_LVL_TMDMOD() \ - if( status_get_lv(src) > 100 ) \ - md.damage = md.damage * 150 / 100 + md.damage * status_get_lv(src) / 100; + if( iStatus->get_lv(src) > 100 ) \ + md.damage = md.damage * 150 / 100 + md.damage * iStatus->get_lv(src) / 100; #else #define RE_LVL_DMOD(val) #define RE_LVL_MDMOD(val) |