summaryrefslogtreecommitdiff
path: root/src/map/battle.h
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.h
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.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;