summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-17 19:32:41 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-17 19:32:41 +0000
commit23380d29046c90f90ab1234cba6dd6e8b1a3b55a (patch)
treeb8e46fa343d6f3db3f57b9bd0877c6f70cf24391
parent1be1ea3b265e4cfbd8339c8e13b7a46615a9b6d3 (diff)
downloadhercules-23380d29046c90f90ab1234cba6dd6e8b1a3b55a.tar.gz
hercules-23380d29046c90f90ab1234cba6dd6e8b1a3b55a.tar.bz2
hercules-23380d29046c90f90ab1234cba6dd6e8b1a3b55a.tar.xz
hercules-23380d29046c90f90ab1234cba6dd6e8b1a3b55a.zip
Changed the duel_time_interval setting's lower bound to 0 (to allow disabling the delay)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11031 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/battle.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 2fa09f053..d72a48ea9 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -6,6 +6,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/08/17
* Implemented the official dual-wield aspd equation [ultramage]
- using 0.7 instead of 0.66 as modifier (so aspd will be lower now)
+ - see topic:151132 for details
2007/08/16
* Fixed eAthena's wrong interpretation of the respawn times [Playtester]
* Added icons for NPC_CRITICALWOUND and NPC_SLOWCAST [Playtester]
diff --git a/src/map/battle.c b/src/map/battle.c
index 00b7b64db..fe7f238c3 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3665,7 +3665,7 @@ static const struct _battle_data {
{ "duel_allow_gvg", &battle_config.duel_allow_gvg, 0, 0, 1, },
{ "duel_allow_teleport", &battle_config.duel_allow_teleport, 0, 0, 1, },
{ "duel_autoleave_when_die", &battle_config.duel_autoleave_when_die, 1, 0, 1, },
- { "duel_time_interval", &battle_config.duel_time_interval, 60, 1, INT_MAX, },
+ { "duel_time_interval", &battle_config.duel_time_interval, 60, 0, INT_MAX, },
{ "duel_only_on_same_map", &battle_config.duel_only_on_same_map, 0, 0, 1, },
{ "skip_teleport_lv1_menu", &battle_config.skip_teleport_lv1_menu, 0, 0, 1, },
{ "allow_skill_without_day", &battle_config.allow_skill_without_day, 0, 0, 1, },