summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2020-07-26 19:07:28 +0200
committerGitHub <noreply@github.com>2020-07-26 19:07:28 +0200
commit43e4d537acac47dc923fac445f9a6f476db2d18c (patch)
tree5bc392f9e1b6b928d7168ec6f024629423aabb4c /src/map/battle.c
parent909054bf043ff51ccd476418075f8bf1dc55b27f (diff)
parentd3c24f7d9ae64354e446a85ba0dad21daca589c1 (diff)
downloadhercules-43e4d537acac47dc923fac445f9a6f476db2d18c.tar.gz
hercules-43e4d537acac47dc923fac445f9a6f476db2d18c.tar.bz2
hercules-43e4d537acac47dc923fac445f9a6f476db2d18c.tar.xz
hercules-43e4d537acac47dc923fac445f9a6f476db2d18c.zip
Merge pull request #2652 from Emistry/mf_nopet
Add NoPet mapflag
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 689622cf4..a571a555d 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -7100,7 +7100,6 @@ static const struct battle_data {
{ "pet_max_stats", &battle_config.pet_max_stats, 99, 0, INT_MAX, },
{ "pet_max_atk1", &battle_config.pet_max_atk1, 750, 0, INT_MAX, },
{ "pet_max_atk2", &battle_config.pet_max_atk2, 1000, 0, INT_MAX, },
- { "pet_disable_in_gvg", &battle_config.pet_no_gvg, 0, 0, 1, },
{ "pet_remove_immediately", &battle_config.pet_remove_immediately, 1, 0, 1, },
{ "skill_min_damage", &battle_config.skill_min_damage, 2|4, 0, 1|2|4, },
{ "finger_offensive_type", &battle_config.finger_offensive_type, 0, 0, 1, },