summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-01-05 07:04:22 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-01-05 07:04:22 +0000
commit8e87d2d3248835de4a3677fa16c8abf31e36e570 (patch)
tree06e7f070863e2eeab7b3af9d434a3632045d454c /src/map/battle.c
parentdc28241d3c6716fed00b78d9a6977f89c4644178 (diff)
downloadhercules-8e87d2d3248835de4a3677fa16c8abf31e36e570.tar.gz
hercules-8e87d2d3248835de4a3677fa16c8abf31e36e570.tar.bz2
hercules-8e87d2d3248835de4a3677fa16c8abf31e36e570.tar.xz
hercules-8e87d2d3248835de4a3677fa16c8abf31e36e570.zip
* Fixed skill_require_db reading somehow getting corrupted if weapons usable for the skill is more than 20
* Fixed @killmonster crashing the server with summoned monsters git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@908 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 60e038fd0..f82e60cd2 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -5325,7 +5325,8 @@ static const struct {
{ "motd_type", &battle_config.motd_type}, // [celest]
{ "allow_atcommand_when_mute", &battle_config.allow_atcommand_when_mute}, // [celest]
{ "finding_ore_rate", &battle_config.finding_ore_rate}, // [celest]
- { "exp_calc_type", &battle_config.exp_calc_type}, // [celest]
+ { "exp_calc_type", &battle_config.exp_calc_type}, // [celest]
+ { "double_login_system", &battle_config.double_login_system}, // [celest]
//SQL-only options start
#ifndef TXT_ONLY
@@ -5586,6 +5587,7 @@ void battle_set_defaults() {
battle_config.castrate_dex_scale = 150;
battle_config.area_size = 14;
battle_config.exp_calc_type = 1;
+ battle_config.double_login_system = 0;
//SQL-only options start
#ifndef TXT_ONLY
@@ -5723,6 +5725,9 @@ void battle_validate_conf() {
if (battle_config.vending_max_value > 10000000 || battle_config.vending_max_value<=0) // Lupus & Kobra_k88
battle_config.vending_max_value = 10000000;
+ if (battle_config.double_login_system < 0)
+ battle_config.double_login_system = 0;
+
}
/*==========================================