diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-18 07:00:31 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-18 07:00:31 +0000 |
| commit | 712ea2e956dbaae6f23229e0c7634cd95a14fe9d (patch) | |
| tree | f91b0bcbfe657ffe3eff11c793c226a7c72f0335 /src/map/battle.c | |
| parent | 13c7d7cbceddc381bfaeb54889364780573dd0ae (diff) | |
| download | hercules-712ea2e956dbaae6f23229e0c7634cd95a14fe9d.tar.gz hercules-712ea2e956dbaae6f23229e0c7634cd95a14fe9d.tar.bz2 hercules-712ea2e956dbaae6f23229e0c7634cd95a14fe9d.tar.xz hercules-712ea2e956dbaae6f23229e0c7634cd95a14fe9d.zip | |
* Fixed the bDamageWhenUnequip effect dealing damage when unequipping unrelated items
* Fixed Incantation Samurai card reducing hp too quickly
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1248 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 87d4cd03a..e3980090d 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4478,11 +4478,11 @@ 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 < 0) // added by [Yor] - battle_config.day_duration = 0; - if (battle_config.night_duration < 0) // added by [Yor] - battle_config.night_duration = 0; - + if (battle_config.day_duration < 60000) // added by [Yor] + battle_config.day_duration = 60000; + if (battle_config.night_duration < 60000) // added by [Yor] + battle_config.night_duration = 60000; + if (battle_config.ban_spoof_namer < 0) // added by [Yor] battle_config.ban_spoof_namer = 0; else if (battle_config.ban_spoof_namer > 32767) |