summaryrefslogtreecommitdiff
path: root/src/map/npc.h
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2018-07-23 01:04:25 +0200
committerGitHub <noreply@github.com>2018-07-23 01:04:25 +0200
commitbe3209bc5ff1b88314c47a6fdc53d73deaa9e96a (patch)
treea12e7ac7b7e6ae8410ba170d345a3022da0e51a5 /src/map/npc.h
parentbcaf5eaa9c8ef65068ab5468d7bd13e2df516cab (diff)
parent6c73aa1b03b04d4d9a2ba9056b8583475856da12 (diff)
downloadhercules-be3209bc5ff1b88314c47a6fdc53d73deaa9e96a.tar.gz
hercules-be3209bc5ff1b88314c47a6fdc53d73deaa9e96a.tar.bz2
hercules-be3209bc5ff1b88314c47a6fdc53d73deaa9e96a.tar.xz
hercules-be3209bc5ff1b88314c47a6fdc53d73deaa9e96a.zip
Merge pull request #2134 from 4144/itemint
Update int fields to using int32
Diffstat (limited to 'src/map/npc.h')
-rw-r--r--src/map/npc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/npc.h b/src/map/npc.h
index fa8b12be5..eff4ed4ec 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -57,14 +57,14 @@ struct npc_label_list {
int pos;
};
struct npc_item_list {
- unsigned short nameid;
+ int nameid;
unsigned int value;
unsigned int qty;
};
struct npc_shop_data {
unsigned char type;/* what am i */
struct npc_item_list *item;/* list */
- unsigned short items;/* total */
+ unsigned int items;/* total */
};
struct npc_parse;
struct npc_data {