diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-03 19:59:48 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-03 19:59:48 +0000 |
| commit | bb0a08a67c73be469c130567ec9e6c5b8a4a2963 (patch) | |
| tree | dce696635219fd87cdc01fe6a04718a55b217f0f /src/map/battle.c | |
| parent | 695aa3dbc9810b7ad25f2eb4e1c3eb92ba6926f3 (diff) | |
| download | hercules-bb0a08a67c73be469c130567ec9e6c5b8a4a2963.tar.gz hercules-bb0a08a67c73be469c130567ec9e6c5b8a4a2963.tar.bz2 hercules-bb0a08a67c73be469c130567ec9e6c5b8a4a2963.tar.xz hercules-bb0a08a67c73be469c130567ec9e6c5b8a4a2963.zip | |
- Char-server SQL won't perform the reconnect cleanup routines when kick_on_disconnect is disabled.
- Renamed summons_inherit_effects to summons_trigger_autospells as the setting now only makes the attacks of the slaves trigger the autospells of the master (as it should be).
- Corrected code capping no_spawn_on_player to 50 when the max should be 100.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7459 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index f8f0a56d1..c4a5b29fb 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3352,7 +3352,7 @@ static const struct battle_data_short { { "boss_spawn_delay", &battle_config.boss_spawn_delay }, { "slaves_inherit_mode", &battle_config.slaves_inherit_mode }, { "slaves_inherit_speed", &battle_config.slaves_inherit_speed }, - { "summons_inherit_effects", &battle_config.summons_inherit_effects }, + { "summons_trigger_autospells", &battle_config.summons_trigger_autospells }, { "pc_damage_walk_delay_rate", &battle_config.pc_walk_delay_rate }, { "damage_walk_delay_rate", &battle_config.walk_delay_rate }, { "multihit_delay", &battle_config.multihit_delay }, @@ -3749,7 +3749,7 @@ void battle_set_defaults() { battle_config.boss_spawn_delay=100; battle_config.slaves_inherit_mode=1; battle_config.slaves_inherit_speed=1; - battle_config.summons_inherit_effects=1; + battle_config.summons_trigger_autospells=1; battle_config.pc_walk_delay_rate=20; battle_config.walk_delay_rate=100; battle_config.multihit_delay=80; @@ -4198,8 +4198,8 @@ void battle_validate_conf() { if (battle_config.plant_spawn_delay < 0) battle_config.plant_spawn_delay = 0; */ - if (battle_config.no_spawn_on_player > 50) - battle_config.no_spawn_on_player = 50; + if (battle_config.no_spawn_on_player > 100) + battle_config.no_spawn_on_player = 100; if (battle_config.mob_remove_delay < 15000) //Min 15 sec battle_config.mob_remove_delay = 15000; if (battle_config.dynamic_mobs > 1) |