summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorcsnv <ctt@csnv.es>2014-09-11 19:07:54 +0200
committercsnv <ctt@csnv.es>2014-09-11 19:07:54 +0200
commitf36f01ba8099a741c3eb86076d3bc1f89d758e52 (patch)
treea6cfa10058dcce45089521cdc81c61496dc48c7a /src/map/battle.c
parent4abf2cfb29dbca5d920b4d3fc641a60d0771f126 (diff)
downloadhercules-f36f01ba8099a741c3eb86076d3bc1f89d758e52.tar.gz
hercules-f36f01ba8099a741c3eb86076d3bc1f89d758e52.tar.bz2
hercules-f36f01ba8099a741c3eb86076d3bc1f89d758e52.tar.xz
hercules-f36f01ba8099a741c3eb86076d3bc1f89d758e52.zip
Added option for song timers behaviour. Fixes bug 8265
- Fixes bug 8265: http://hercules.ws/board/tracker/issue-8265-bragis-poem-overlapped-20-seconds-effect/ - Added setting in /conf/battle/skill.conf song_timer_reset: switch between official behaviour (songs don't reset time from prior songs) or eathena (every song resets the timer)
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 30b358492..8930d3a7e 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -6733,6 +6733,7 @@ static const struct battle_data {
{ "mail_show_status", &battle_config.mail_show_status, 0, 0, 2, },
{ "client_limit_unit_lv", &battle_config.client_limit_unit_lv, 0, 0, BL_ALL, },
{ "client_emblem_max_blank_percent", &battle_config.client_emblem_max_blank_percent, 100, 0, 100, },
+ { "song_timer_reset", &battle_config.song_timer_reset, 0, 0, 1, },
// BattleGround Settings
{ "bg_update_interval", &battle_config.bg_update_interval, 1000, 100, INT_MAX, },
{ "bg_flee_penalty", &battle_config.bg_flee_penalty, 20, 0, INT_MAX, },