summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorKenpachi Developer <Kenpachi.Developer@gmx.de>2020-02-06 14:58:48 +0100
committerKenpachi Developer <Kenpachi.Developer@gmx.de>2020-02-06 14:58:48 +0100
commit506341e881570dc45c9d56bdec1a3a9ad95598f9 (patch)
treec097b2b8df73de3ddb015ec6f301f5250409c7c7 /src/map
parentc03722679a01e5f181c2138565e95a6b0981a124 (diff)
downloadhercules-506341e881570dc45c9d56bdec1a3a9ad95598f9.tar.gz
hercules-506341e881570dc45c9d56bdec1a3a9ad95598f9.tar.bz2
hercules-506341e881570dc45c9d56bdec1a3a9ad95598f9.tar.xz
hercules-506341e881570dc45c9d56bdec1a3a9ad95598f9.zip
Merge pre-RE/RE case SP_VARCASTRATE in pc_readparam() function
Diffstat (limited to 'src/map')
-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 c4f9d8be0..68e384b21 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
}