summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-11-03 08:19:15 -0200
committershennetsind <ind@henn.et>2014-11-03 08:19:15 -0200
commit8fcff554229f0ef60c0f86218224799ad50fbf0e (patch)
treea342d393061189e5b0900b6ff05adb9d2c32240d
parentbee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (diff)
downloadhercules-8fcff554229f0ef60c0f86218224799ad50fbf0e.tar.gz
hercules-8fcff554229f0ef60c0f86218224799ad50fbf0e.tar.bz2
hercules-8fcff554229f0ef60c0f86218224799ad50fbf0e.tar.xz
hercules-8fcff554229f0ef60c0f86218224799ad50fbf0e.zip
Re-issuing conflicted-out content on battle.c (see history/follow up)
Signed-off-by: shennetsind <ind@henn.et>
-rw-r--r--src/map/battle.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 40ef15191..903414f90 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -6840,6 +6840,7 @@ static const struct battle_data {
{ "monster_chase_refresh", &battle_config.mob_chase_refresh, 1, 0, 30, },
{ "mob_icewall_walk_block", &battle_config.mob_icewall_walk_block, 75, 0, 255, },
{ "boss_icewall_walk_block", &battle_config.boss_icewall_walk_block, 0, 0, 255, },
+ { "feature.roulette", &battle_config.feature_roulette, 1, 0, 1, },
};
#ifndef STATS_OPT_OUT
/**
@@ -7091,6 +7092,13 @@ void battle_adjust_conf(void) {
}
#endif
+#if PACKETVER < 20141022
+ if( battle_config.feature_roulette ) {
+ ShowWarning("conf/battle/feature.conf roulette is enabled but it requires PACKETVER 2014-10-22 or newer, disabling...\n");
+ battle_config.feature_roulette = 0;
+ }
+#endif
+
#if PACKETVER > 20120000 && PACKETVER < 20130515 /* exact date (when it started) not known */
if( battle_config.feature_auction == 1 ) {
ShowWarning("conf/battle/feature.conf:feature.auction is enabled but it is not stable on PACKETVER "EXPAND_AND_QUOTE(PACKETVER)", disabling...\n");