summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichieru <Michieru@users.noreply.github.com>2014-09-20 04:13:18 +0200
committerMichieru <Michieru@users.noreply.github.com>2014-09-20 04:13:18 +0200
commitbb16460e131de5ab6cd39cec25c03abd2ba7f451 (patch)
tree8aad1cafd189adacdf703a330edf71f4ccec0570 /src
parent9dd0f3afc2fcdb577302445474c83a1f379d9c41 (diff)
downloadhercules-bb16460e131de5ab6cd39cec25c03abd2ba7f451.tar.gz
hercules-bb16460e131de5ab6cd39cec25c03abd2ba7f451.tar.bz2
hercules-bb16460e131de5ab6cd39cec25c03abd2ba7f451.tar.xz
hercules-bb16460e131de5ab6cd39cec25c03abd2ba7f451.zip
Fix attack in pre-re (bug:8353)
Diffstat (limited to 'src')
-rw-r--r--src/map/status.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/map/status.c b/src/map/status.c
index c13ee253e..5d1b92a51 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1969,17 +1969,12 @@ unsigned short status_base_atk(const struct block_list *bl, const struct status_
//Normally only players have base-atk, but homunc have a different batk
// equation, hinting that perhaps non-players should use this for batk.
// [Skotlex]
- if (bl->type == BL_HOM) {
#ifdef RENEWAL
+ if (bl->type == BL_HOM)
str = (int)(floor((rstr + dex + st->luk) / 3) + floor(((TBL_HOM*)bl)->homunculus.level / 10));
-#else
+#endif
dstr = str/10;
str += dstr*dstr;
-#endif
- } else if (bl->type != BL_PC) {
- dstr = str/10;
- str += dstr*dstr;
- } else
if (bl->type == BL_PC)
#ifdef RENEWAL
str = (int)(rstr + (float)dex/5 + (float)st->luk/3 + (float)((TBL_PC*)bl)->status.base_level/4);