summaryrefslogtreecommitdiff
path: root/src/map/battle.h
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.h
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.h')
-rw-r--r--src/map/battle.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/map/battle.h b/src/map/battle.h
index 8d1a3cd39..161ddebc4 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -169,6 +169,7 @@ struct Battle_Config {
int emergency_call;
int guild_aura;
int pc_invincible_time;
+ int song_timer_reset;
int pet_catch_rate;
int pet_rename;