diff options
| author | Haru <haru@dotalux.com> | 2020-06-01 04:18:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-01 04:18:52 +0200 |
| commit | 530af7e587899f66854447e2b8251cbf12c481c3 (patch) | |
| tree | 74453a3f8e6fdeaa3349132b820e29ec8fee8d7b /src/map/battle.c | |
| parent | 8a4667a265227587dcc288f75dfe948f5df46034 (diff) | |
| parent | 9a64eca5235da46655ca64ba5916c6fd4d90208a (diff) | |
| download | hercules-530af7e587899f66854447e2b8251cbf12c481c3.tar.gz hercules-530af7e587899f66854447e2b8251cbf12c481c3.tar.bz2 hercules-530af7e587899f66854447e2b8251cbf12c481c3.tar.xz hercules-530af7e587899f66854447e2b8251cbf12c481c3.zip | |
Merge pull request #2718 from Kenpachi2k13/prere_use_items_skills_in_npc
Add/extend battle flags to enable item/skill usage while interacting with NPC
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 236ed70b7..611154953 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -7378,7 +7378,7 @@ static const struct battle_data { { "item_restricted_consumption_type", &battle_config.item_restricted_consumption_type,1, 0, 1, }, { "unequip_restricted_equipment", &battle_config.unequip_restricted_equipment, 0, 0, 3, }, { "max_walk_path", &battle_config.max_walk_path, 17, 1, MAX_WALKPATH, }, - { "item_enabled_npc", &battle_config.item_enabled_npc, 1, 0, 1, }, + { "item_enabled_npc", &battle_config.item_enabled_npc, 1, 0, INT_MAX, }, { "gm_ignore_warpable_area", &battle_config.gm_ignore_warpable_area, 0, 2, 100, }, { "packet_obfuscation", &battle_config.packet_obfuscation, 1, 0, 3, }, { "client_accept_chatdori", &battle_config.client_accept_chatdori, 0, 0, INT_MAX, }, @@ -7425,6 +7425,7 @@ static const struct battle_data { { "min_item_sell_price", &battle_config.min_item_sell_price, 0, 0, INT_MAX, }, { "display_fake_hp_when_dead", &battle_config.display_fake_hp_when_dead, 1, 0, 1, }, { "magicrod_type", &battle_config.magicrod_type, 0, 0, 1, }, + { "skill_enabled_npc", &battle_config.skill_enabled_npc, 0, 0, INT_MAX, }, { "features/enable_achievement_system", &battle_config.feature_enable_achievement, 1, 0, 1, }, { "ping_timer_inverval", &battle_config.ping_timer_interval, 30, 0, 99999999, }, { "ping_time", &battle_config.ping_time, 20, 0, 99999999, }, |