summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorMichieru <Michieru@users.noreply.github.com>2014-09-12 09:20:32 +0200
committerMichieru <Michieru@users.noreply.github.com>2014-09-12 09:20:32 +0200
commit85260ebe972650fb46fecad8863f9682f20b2647 (patch)
treea6cfa10058dcce45089521cdc81c61496dc48c7a /src/map/battle.c
parent3718b169b26e90dda3b94593e650aea1d892bda5 (diff)
parentf36f01ba8099a741c3eb86076d3bc1f89d758e52 (diff)
downloadhercules-85260ebe972650fb46fecad8863f9682f20b2647.tar.gz
hercules-85260ebe972650fb46fecad8863f9682f20b2647.tar.bz2
hercules-85260ebe972650fb46fecad8863f9682f20b2647.tar.xz
hercules-85260ebe972650fb46fecad8863f9682f20b2647.zip
Merge pull request #343 from csnv/aegissong
Added option for song timers behaviour. Fixes bug 8265
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, },