diff options
| author | Michieru <Michieru@users.noreply.github.com> | 2014-09-19 15:04:25 +0200 |
|---|---|---|
| committer | Michieru <Michieru@users.noreply.github.com> | 2014-09-19 15:04:25 +0200 |
| commit | 0b617096e7c81a0861b362769a835f23118431dc (patch) | |
| tree | 79a714e7b4aaa769695d7cc01504e17374d3ebf3 /src/map/battle.h | |
| parent | db3605926534c83c1d1717955a4b55d2d951302f (diff) | |
| parent | 76662cc551f4256344640c91b2601923e15b2f7c (diff) | |
| download | hercules-0b617096e7c81a0861b362769a835f23118431dc.tar.gz hercules-0b617096e7c81a0861b362769a835f23118431dc.tar.bz2 hercules-0b617096e7c81a0861b362769a835f23118431dc.tar.xz hercules-0b617096e7c81a0861b362769a835f23118431dc.zip | |
Merge pull request #360 from csnv/somefixes
Fixes damage missing. Snap dodging bug.
Diffstat (limited to 'src/map/battle.h')
| -rw-r--r-- | src/map/battle.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/battle.h b/src/map/battle.h index 161ddebc4..734a6187d 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -169,7 +169,6 @@ struct Battle_Config { int emergency_call; int guild_aura; int pc_invincible_time; - int song_timer_reset; int pet_catch_rate; int pet_rename; @@ -475,6 +474,9 @@ struct Battle_Config { int case_sensitive_aegisnames; int guild_castle_invite; int guild_castle_expulsion; + + int song_timer_reset; // [csnv] + int snap_dodge; // Enable or disable dodging damage snapping away [csnv] }; extern struct Battle_Config battle_config; |