summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 50c35867a..27b718bc9 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3731,7 +3731,8 @@ static const struct battle_data_short {
{ "duel_allow_teleport", &battle_config.duel_allow_teleport}, // [LuzZza]
{ "duel_autoleave_when_die", &battle_config.duel_autoleave_when_die}, //[LuzZza]
{ "duel_time_interval", &battle_config.duel_time_interval}, // [LuzZza]
-
+ { "duel_only_on_same_map", &battle_config.duel_only_on_same_map}, // [Toms]
+
{ "skip_teleport_lv1_menu", &battle_config.skip_teleport_lv1_menu}, // [LuzZza]
{ "allow_skill_without_day", &battle_config.allow_skill_without_day}, // [Komurka]
{ "allow_es_magic_player", &battle_config.allow_es_magic_pc },
@@ -4156,10 +4157,11 @@ void battle_set_defaults() {
battle_config.duel_enable = 1;
battle_config.duel_allow_pvp = 0;
- battle_config.duel_allow_pvp = 0;
+ battle_config.duel_allow_gvg = 0;
battle_config.duel_allow_teleport = 0;
battle_config.duel_autoleave_when_die = 1;
battle_config.duel_time_interval = 60;
+ battle_config.duel_only_on_same_map = 0;
battle_config.skip_teleport_lv1_menu = 0;
battle_config.allow_skill_without_day = 0;