summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2020-06-28 17:39:17 +0200
committerGitHub <noreply@github.com>2020-06-28 17:39:17 +0200
commit4192f3845a4c7a419d13a736aa2da27926efe61f (patch)
treeee32b5fd97b376b6bed42af81f534d46d00f4c51 /src
parent9ee2f5b8e805931da633849a0d5f11fa7b187a28 (diff)
parent753474e217a962a6a109d80fa58f68322a873597 (diff)
downloadhercules-4192f3845a4c7a419d13a736aa2da27926efe61f.tar.gz
hercules-4192f3845a4c7a419d13a736aa2da27926efe61f.tar.bz2
hercules-4192f3845a4c7a419d13a736aa2da27926efe61f.tar.xz
hercules-4192f3845a4c7a419d13a736aa2da27926efe61f.zip
Merge pull request #2784 from Kenpachi2k13/item_enabled_npc
Enlarge field size of npc_item_flag in struct script_state according to possible values
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/script.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index ea00f938f..b5c0cf4fa 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -7380,7 +7380,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, INT_MAX, },
+ { "item_enabled_npc", &battle_config.item_enabled_npc, 1, 0, 3, },
{ "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, },
diff --git a/src/map/script.h b/src/map/script.h
index df5297ac0..4bf8c436b 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -703,7 +703,7 @@ struct script_state {
int bk_npcid;
unsigned freeloop : 1;// used by buildin_freeloop
unsigned op2ref : 1;// used by op_2
- unsigned npc_item_flag : 1;
+ unsigned npc_item_flag : 2;
unsigned int id;
};