summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-19 05:32:30 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-19 05:32:30 +0000
commitccfcd256566afa04a502a8c0ae0151382610defc (patch)
treeded751145cf0882e976ab5fa42177ec09fe27d67 /src
parent3bcda9cbaba0fd592bbc51c0c61c0fe5efb2de07 (diff)
downloadhercules-ccfcd256566afa04a502a8c0ae0151382610defc.tar.gz
hercules-ccfcd256566afa04a502a8c0ae0151382610defc.tar.bz2
hercules-ccfcd256566afa04a502a8c0ae0151382610defc.tar.xz
hercules-ccfcd256566afa04a502a8c0ae0151382610defc.zip
Fixed day and night settings not ignored even if they are set to 0
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1252 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index e3980090d..483ddffb7 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -4478,9 +4478,9 @@ void battle_validate_conf() {
battle_config.night_at_start = 0;
else if (battle_config.night_at_start > 1) // added by [Yor]
battle_config.night_at_start = 1;
- if (battle_config.day_duration < 60000) // added by [Yor]
+ if (battle_config.day_duration != 0 && battle_config.day_duration < 60000) // added by [Yor]
battle_config.day_duration = 60000;
- if (battle_config.night_duration < 60000) // added by [Yor]
+ if (battle_config.night_duration != 0 && battle_config.night_duration < 60000) // added by [Yor]
battle_config.night_duration = 60000;
if (battle_config.ban_spoof_namer < 0) // added by [Yor]