4 files changed, 15 insertions, 14 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 4a79245a1..fa8f3048d 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -371,13 +371,13 @@ struct item_option {
 
 struct item {
 	int id;
-	short nameid;
+	int nameid;
 	short amount;
 	unsigned int equip; // Location(s) where item is equipped (using enum equip_pos for bitmasking).
 	char identify;
 	char refine;
 	char attribute;
-	short card[MAX_SLOTS];
+	int card[MAX_SLOTS];
 	unsigned int expire_time;
 	char favorite;
 	unsigned char bound;
@@ -538,8 +538,8 @@ struct s_pet {
 	int pet_id;
 	short class_;
 	short level;
-	short egg_id;//pet egg id
-	short equip;//pet equip name_id
+	int egg_id;//pet egg id
+	int equip;//pet equip name_id
 	short intimate;//pet friendly
 	short hungry;//pet hungry
 	char name[NAME_LENGTH];
@@ -634,7 +634,8 @@ struct mmo_charstatus {
 	unsigned int option;
 	short manner; // Defines how many minutes a char will be muted, each negative point is equivalent to a minute.
 	unsigned char karma;
-	short hair,hair_color,clothes_color,body;
+	short hair, hair_color, clothes_color;
+	int body;
 	int party_id,guild_id,clan_id,pet_id,hom_id,mer_id,ele_id;
 	int fame;
 
@@ -644,12 +645,12 @@ struct mmo_charstatus {
 	int sword_faith, sword_calls;
 
 	struct {
-		short weapon;      ///< Weapon view sprite id.
-		short shield;      ///< Shield view sprite id.
-		short head_top;    ///< Top headgear view sprite id.
-		short head_mid;    ///< Middle headgear view sprite id.
-		short head_bottom; ///< Bottom headgear view sprite id.
-		short robe;        ///< Robe view sprite id.
+		int weapon;      ///< Weapon view sprite id.
+		int shield;      ///< Shield view sprite id.
+		int head_top;    ///< Top headgear view sprite id.
+		int head_mid;    ///< Middle headgear view sprite id.
+		int head_bottom; ///< Bottom headgear view sprite id.
+		int robe;        ///< Robe view sprite id.
 	} look;
 
 	char name[NAME_LENGTH];
diff --git a/src/map/buyingstore.h b/src/map/buyingstore.h
index e96cc832d..60fd047f7 100644
--- a/src/map/buyingstore.h
+++ b/src/map/buyingstore.h
@@ -77,7 +77,7 @@ struct s_buyingstore {
  **/
 struct buyingstore_interface {
 	unsigned int nextid;
-	short blankslots[MAX_SLOTS];  // used when checking whether or not an item's card slots are blank
+	int blankslots[MAX_SLOTS];  // used when checking whether or not an item's card slots are blank
 	struct item_option blankoptions[MAX_ITEM_OPTIONS];  // used for search result temporary.
 	/* */
 	bool (*setup) (struct map_session_data* sd, unsigned char slots);
diff --git a/src/map/searchstore.c b/src/map/searchstore.c
index 6b847eb92..1cf254e52 100644
--- a/src/map/searchstore.c
+++ b/src/map/searchstore.c
@@ -345,7 +345,7 @@ static void searchstore_clearremote(struct map_session_data *sd)
 }
 
 /// receives results from a store-specific callback
-static bool searchstore_result(struct map_session_data *sd, unsigned int store_id, int account_id, const char *store_name, unsigned short nameid, unsigned short amount, unsigned int price, const short *card, unsigned char refine, const struct item_option *option)
+static bool searchstore_result(struct map_session_data *sd, unsigned int store_id, int account_id, const char *store_name, unsigned short nameid, unsigned short amount, unsigned int price, const int *card, unsigned char refine, const struct item_option *option)
 {
 	struct s_search_store_info_item* ssitem;
 
diff --git a/src/map/searchstore.h b/src/map/searchstore.h
index 03924c29a..3d4a3f36a 100644
--- a/src/map/searchstore.h
+++ b/src/map/searchstore.h
@@ -109,7 +109,7 @@ struct searchstore_interface {
 	void (*click) (struct map_session_data* sd, int account_id, int store_id, unsigned short nameid);
 	bool (*queryremote) (struct map_session_data* sd, int account_id);
 	void (*clearremote) (struct map_session_data* sd);
-	bool (*result) (struct map_session_data* sd, unsigned int store_id, int account_id, const char* store_name, unsigned short nameid, unsigned short amount, unsigned int price, const short* card, unsigned char refine, const struct item_option *option);
+	bool (*result) (struct map_session_data* sd, unsigned int store_id, int account_id, const char* store_name, unsigned short nameid, unsigned short amount, unsigned int price, const int* card, unsigned char refine, const struct item_option *option);
 };
 
 #ifdef HERCULES_CORE