summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2020-02-09 23:31:04 +0100
committerGitHub <noreply@github.com>2020-02-09 23:31:04 +0100
commitb69b32d6f90968443380978237692cf865b57f56 (patch)
tree0ee98a20ef243499397ece4c40dd9394b6e64979
parentfa8651a64cb9900b8a86f9810ab7b4eb1613da5c (diff)
parent506341e881570dc45c9d56bdec1a3a9ad95598f9 (diff)
downloadhercules-b69b32d6f90968443380978237692cf865b57f56.tar.gz
hercules-b69b32d6f90968443380978237692cf865b57f56.tar.bz2
hercules-b69b32d6f90968443380978237692cf865b57f56.tar.xz
hercules-b69b32d6f90968443380978237692cf865b57f56.zip
Merge pull request #2624 from Kenpachi2k13/issue#1311
Merge pre-RE/RE case SP_VARCASTRATE in pc_readparam() function
-rw-r--r--src/map/pc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 9d2816f3d..f6edb5e3c 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -8417,8 +8417,12 @@ static int64 pc_readparam(const struct map_session_data *sd, int type)
case SP_FLEE1: val = sd->battle_status.flee; break;
case SP_FLEE2: val = sd->battle_status.flee2; break;
case SP_DEFELE: val = sd->battle_status.def_ele; break;
-#ifndef RENEWAL_CAST
case SP_VARCASTRATE:
+#ifdef RENEWAL_CAST
+ val = sd->bonus.varcastrate;
+ break;
+#else
+ FALLTHROUGH
#endif
case SP_CASTRATE:
val = sd->castrate;
@@ -8504,7 +8508,6 @@ static int64 pc_readparam(const struct map_session_data *sd, int type)
case SP_FIXCASTRATE: val = sd->bonus.fixcastrate; break;
case SP_ADD_FIXEDCAST: val = sd->bonus.add_fixcast; break;
#ifdef RENEWAL_CAST
- case SP_VARCASTRATE: val = sd->bonus.varcastrate; break;
case SP_ADD_VARIABLECAST:val = sd->bonus.add_varcast; break;
#endif
}