diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-19 05:32:30 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-19 05:32:30 +0000 |
| commit | ccfcd256566afa04a502a8c0ae0151382610defc (patch) | |
| tree | ded751145cf0882e976ab5fa42177ec09fe27d67 | |
| parent | 3bcda9cbaba0fd592bbc51c0c61c0fe5efb2de07 (diff) | |
| download | hercules-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
| -rw-r--r-- | Changelog-SVN.txt | 4 | ||||
| -rw-r--r-- | src/map/battle.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt index f8257d7ad..1376356f9 100644 --- a/Changelog-SVN.txt +++ b/Changelog-SVN.txt @@ -1,5 +1,9 @@ Date Added +03/19 + * Fixed day and night settings not ignored even if they are set to 0, + my bad ^^; [celest] + 03/18 * Fixed a crash when freeing memory of pets [celest] * Added Cygwin support to the -DDUMPSTACK option, and changed its format 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] |