Changed all unsigned short to uint16 (#8959)

src/char/char_clif.cpp

@@ -54,7 +54,7 @@ bool pincode_allowed( char* pincode );
 // reason
 // 0: success
 // 1: failed
-void chclif_moveCharSlotReply( int32 fd, struct char_session_data* sd, unsigned short index, short reason ){
+void chclif_moveCharSlotReply( int32 fd, struct char_session_data* sd, uint16 index, short reason ){
 	WFIFOHEAD(fd,8);
 	WFIFOW(fd,0) = HEADER_HC_ACK_CHANGE_CHARACTER_SLOT;
 	WFIFOW(fd,2) = 8;
@@ -1086,7 +1086,7 @@ int32 chclif_parse_charselect(int32 fd, struct char_session_data* sd,uint32 ipl)
 			return 0;
 #else
 			// Try to select a map for the user
-			unsigned short j;
+			uint16 j;
 			//First check that there's actually a map server online.
 			ARR_FIND( 0, ARRAYLENGTH(map_server), j, session_isValid(map_server[j].fd) && !map_server[j].maps.empty() );
 			if (j == ARRAYLENGTH(map_server)) {
@@ -1579,7 +1579,7 @@ int32 chclif_parse(int32 fd) {
 
 	while( RFIFOREST(fd) >= 2 ) {
 		int32 next = 1;
-		unsigned short cmd;
+		uint16 cmd;
 
 		cmd = RFIFOW(fd,0);
 

src/char/char_clif.hpp

@@ -10,7 +10,7 @@
 struct char_session_data;
 enum pincode_state : uint8;
 
-void chclif_moveCharSlotReply( int32 fd, struct char_session_data* sd, unsigned short index, short reason );
+void chclif_moveCharSlotReply( int32 fd, struct char_session_data* sd, uint16 index, short reason );
 int32 chclif_parse_moveCharSlot( int32 fd, struct char_session_data* sd);
 #if PACKETVER_SUPPORTS_PINCODE
 void chclif_pincode_sendstate( int32 fd, struct char_session_data* sd, enum pincode_state state );

src/char/int_elemental.cpp

@@ -149,7 +149,7 @@ void inter_elemental_sql_final(void) {
  * Inter Packets
  *------------------------------------------*/
 int32 inter_elemental_parse_frommap(int32 fd) {
-	unsigned short cmd = RFIFOW(fd,0);
+	uint16 cmd = RFIFOW(fd,0);
 
 	switch( cmd ) {
 		case 0x307c: mapif_parse_elemental_create(fd, (struct s_elemental*)RFIFOP(fd,4)); break;

src/char/int_guild.hpp

@@ -51,7 +51,7 @@ public:
 class CharGuild {
 public:
 	struct mmo_guild guild;
-	unsigned short save_flag;
+	uint16 save_flag;
 };
 
 int32 inter_guild_parse_frommap(int32 fd);

src/char/int_homun.cpp

@@ -235,7 +235,7 @@ bool mapif_homunculus_load(int32 homun_id, struct s_homunculus* hd)
 		if( i < HM_SKILLBASE || i >= HM_SKILLBASE + MAX_HOMUNSKILL )
 			continue;// invalid skill id
 		i = i - HM_SKILLBASE;
-		hd->hskill[i].id = (unsigned short)atoi(data);
+		hd->hskill[i].id = (uint16)atoi(data);
 
 		// lv
 		Sql_GetData(sql_handle, 1, &data, nullptr);
@@ -356,7 +356,7 @@ void mapif_parse_homunculus_rename(int32 fd, uint32 account_id, uint32 char_id,
  *------------------------------------------*/
 int32 inter_homunculus_parse_frommap(int32 fd)
 {
-	unsigned short cmd = RFIFOW(fd,0);
+	uint16 cmd = RFIFOW(fd,0);
 
 	switch( cmd )
 	{

src/char/int_mercenary.cpp

@@ -265,7 +265,7 @@ void inter_mercenary_sql_final(void)
  *------------------------------------------*/
 int32 inter_mercenary_parse_frommap(int32 fd)
 {
-	unsigned short cmd = RFIFOW(fd,0);
+	uint16 cmd = RFIFOW(fd,0);
 
 	switch( cmd )
 	{

src/char/int_storage.cpp

@@ -299,7 +299,7 @@ void mapif_itembound_ack(int32 fd, int32 account_id, int32 guild_id)
  * @param count
  * @author [Cydh]
  */
-void mapif_itembound_store2gstorage(int32 fd, int32 guild_id, struct item items[], unsigned short count) {
+void mapif_itembound_store2gstorage(int32 fd, int32 guild_id, struct item items[], uint16 count) {
 	int32 size = 8 + sizeof(struct item) * MAX_INVENTORY, i;
 
 	WFIFOHEAD(fd, size);
@@ -324,7 +324,7 @@ bool mapif_parse_itembound_retrieve(int32 fd)
 {
 	StringBuf buf;
 	SqlStmt stmt{ *sql_handle };
-	unsigned short i = 0, count = 0;
+	uint16 i = 0, count = 0;
 	struct item item, items[MAX_INVENTORY];
 	int32 j, guild_id = RFIFOW(fd,10);
 	uint32 char_id = RFIFOL(fd,2), account_id = RFIFOL(fd,6);

src/char/inter.cpp

@@ -455,7 +455,7 @@ void inter_to_fd(int32 fd, int32 u_fd, int32 aid, char* msg, ...) {
 	WFIFOHEAD(fd,12 + len);
 
 	WFIFOW(fd,0) = 0x3807;
-	WFIFOW(fd,2) = 12 + (unsigned short)len;
+	WFIFOW(fd,2) = 12 + (uint16)len;
 	WFIFOL(fd,4) = u_fd;
 	WFIFOL(fd,8) = aid;
 	safestrncpy(WFIFOCP(fd,12), msg_out, len);

src/common/db.cpp

@@ -178,7 +178,7 @@ struct db_free {
  * @param maxlen Maximum length of strings in DB_STRING and DB_ISTRING databases
  * @param global_lock Global lock of the database
  * @private
- * @see #db_alloc(const char*,int32,DBType,DBOptions,unsigned short)
+ * @see #db_alloc(const char*,int32,DBType,DBOptions,uint16)
  */
 typedef struct DBMap_impl {
 	// Database interface
@@ -201,7 +201,7 @@ typedef struct DBMap_impl {
 	DBType type;
 	DBOptions options;
 	uint32 item_count;
-	unsigned short maxlen;
+	uint16 maxlen;
 	unsigned global_lock : 1;
 } DBMap_impl;
 
@@ -871,7 +871,7 @@ static void db_free_unlock(DBMap_impl* db)
  * @see #DBComparator
  * @see #db_default_cmp(DBType)
  */
-static int32 db_int_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
+static int32 db_int_cmp(DBKey key1, DBKey key2, uint16 maxlen)
 {
 	(void)maxlen;//not used
 	DB_COUNTSTAT(db_int_cmp);
@@ -893,7 +893,7 @@ static int32 db_int_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
  * @see #DBComparator
  * @see #db_default_cmp(DBType)
  */
-static int32 db_uint_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
+static int32 db_uint_cmp(DBKey key1, DBKey key2, uint16 maxlen)
 {
 	(void)maxlen;//not used
 	DB_COUNTSTAT(db_uint_cmp);
@@ -914,7 +914,7 @@ static int32 db_uint_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
  * @see #DBComparator
  * @see #db_default_cmp(DBType)
  */
-static int32 db_string_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
+static int32 db_string_cmp(DBKey key1, DBKey key2, uint16 maxlen)
 {
 	DB_COUNTSTAT(db_string_cmp);
 	return strncmp((const char *)key1.str, (const char *)key2.str, maxlen);
@@ -932,7 +932,7 @@ static int32 db_string_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
  * @see #DBComparator
  * @see #db_default_cmp(DBType)
  */
-static int32 db_istring_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
+static int32 db_istring_cmp(DBKey key1, DBKey key2, uint16 maxlen)
 {
 	DB_COUNTSTAT(db_istring_cmp);
 	return strncasecmp((const char *)key1.str, (const char *)key2.str, maxlen);
@@ -951,7 +951,7 @@ static int32 db_istring_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
  * @see #DBComparator
  * @see #db_default_cmp(DBType)
  */
-static int32 db_int64_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
+static int32 db_int64_cmp(DBKey key1, DBKey key2, uint16 maxlen)
 {
 	(void)maxlen;//not used
 	DB_COUNTSTAT(db_int64_cmp);
@@ -973,7 +973,7 @@ static int32 db_int64_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
  * @see #DBComparator
  * @see #db_default_cmp(DBType)
  */
-static int32 db_uint64_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
+static int32 db_uint64_cmp(DBKey key1, DBKey key2, uint16 maxlen)
 {
 	(void)maxlen;//not used
 	DB_COUNTSTAT(db_uint64_cmp);
@@ -994,7 +994,7 @@ static int32 db_uint64_cmp(DBKey key1, DBKey key2, unsigned short maxlen)
  * @see #DBHasher
  * @see #db_default_hash(DBType)
  */
-static uint64 db_int_hash(DBKey key, unsigned short maxlen)
+static uint64 db_int_hash(DBKey key, uint16 maxlen)
 {
 	(void)maxlen;//not used
 	DB_COUNTSTAT(db_int_hash);
@@ -1012,7 +1012,7 @@ static uint64 db_int_hash(DBKey key, unsigned short maxlen)
  * @see #DBHasher
  * @see #db_default_hash(DBType)
  */
-static uint64 db_uint_hash(DBKey key, unsigned short maxlen)
+static uint64 db_uint_hash(DBKey key, uint16 maxlen)
 {
 	(void)maxlen;//not used
 	DB_COUNTSTAT(db_uint_hash);
@@ -1028,11 +1028,11 @@ static uint64 db_uint_hash(DBKey key, unsigned short maxlen)
  * @see #DBHasher
  * @see #db_default_hash(DBType)
  */
-static uint64 db_string_hash(DBKey key, unsigned short maxlen)
+static uint64 db_string_hash(DBKey key, uint16 maxlen)
 {
 	const char *k = key.str;
 	uint32 hash = 0;
-	unsigned short i;
+	uint16 i;
 
 	DB_COUNTSTAT(db_string_hash);
 
@@ -1054,11 +1054,11 @@ static uint64 db_string_hash(DBKey key, unsigned short maxlen)
  * @see DBType#DB_ISTRING
  * @see #db_default_hash(DBType)
  */
-static uint64 db_istring_hash(DBKey key, unsigned short maxlen)
+static uint64 db_istring_hash(DBKey key, uint16 maxlen)
 {
 	const char *k = key.str;
 	uint32 hash = 0;
-	unsigned short i;
+	uint16 i;
 
 	DB_COUNTSTAT(db_istring_hash);
 
@@ -1083,7 +1083,7 @@ static uint64 db_istring_hash(DBKey key, unsigned short maxlen)
  * @see #DBHasher
  * @see #db_default_hash(DBType)
  */
-static uint64 db_int64_hash(DBKey key, unsigned short maxlen)
+static uint64 db_int64_hash(DBKey key, uint16 maxlen)
 {
 	(void)maxlen;//not used
 	DB_COUNTSTAT(db_int64_hash);
@@ -1101,7 +1101,7 @@ static uint64 db_int64_hash(DBKey key, unsigned short maxlen)
  * @see #DBHasher
  * @see #db_default_hash(DBType)
  */
-static uint64 db_uint64_hash(DBKey key, unsigned short maxlen)
+static uint64 db_uint64_hash(DBKey key, uint16 maxlen)
 {
 	(void)maxlen;//not used
 	DB_COUNTSTAT(db_uint64_hash);
@@ -2373,7 +2373,7 @@ static DBOptions db_obj_options(DBMap* self)
  * @return Fixed options of the database
  * @private
  * @see #db_default_release(DBType,DBOptions)
- * @see #db_alloc(const char *,int32,DBType,DBOptions,unsigned short)
+ * @see #db_alloc(const char *,int32,DBType,DBOptions,uint16)
  */
 DBOptions db_fix_options(DBType type, DBOptions options)
 {
@@ -2399,12 +2399,12 @@ DBOptions db_fix_options(DBType type, DBOptions options)
  * @param type Type of database
  * @return Comparator for the type of database or nullptr if unknown database
  * @public
- * @see #db_int_cmp(DBKey,DBKey,unsigned short)
- * @see #db_uint_cmp(DBKey,DBKey,unsigned short)
- * @see #db_string_cmp(DBKey,DBKey,unsigned short)
- * @see #db_istring_cmp(DBKey,DBKey,unsigned short)
- * @see #db_int64_cmp(DBKey,DBKey,unsigned short)
- * @see #db_uint64_cmp(DBKey,DBKey,unsigned short)
+ * @see #db_int_cmp(DBKey,DBKey,uint16)
+ * @see #db_uint_cmp(DBKey,DBKey,uint16)
+ * @see #db_string_cmp(DBKey,DBKey,uint16)
+ * @see #db_istring_cmp(DBKey,DBKey,uint16)
+ * @see #db_int64_cmp(DBKey,DBKey,uint16)
+ * @see #db_uint64_cmp(DBKey,DBKey,uint16)
  */
 DBComparator db_default_cmp(DBType type)
 {
@@ -2427,12 +2427,12 @@ DBComparator db_default_cmp(DBType type)
  * @param type Type of database
  * @return Hasher of the type of database or nullptr if unknown database
  * @public
- * @see #db_int_hash(DBKey,unsigned short)
- * @see #db_uint_hash(DBKey,unsigned short)
- * @see #db_string_hash(DBKey,unsigned short)
- * @see #db_istring_hash(DBKey,unsigned short)
- * @see #db_int64_hash(DBKey,unsigned short)
- * @see #db_uint64_hash(DBKey,unsigned short)
+ * @see #db_int_hash(DBKey,uint16)
+ * @see #db_uint_hash(DBKey,uint16)
+ * @see #db_string_hash(DBKey,uint16)
+ * @see #db_istring_hash(DBKey,uint16)
+ * @see #db_int64_hash(DBKey,uint16)
+ * @see #db_uint64_hash(DBKey,uint16)
  */
 DBHasher db_default_hash(DBType type)
 {
@@ -2519,7 +2519,7 @@ DBReleaser db_custom_release(DBRelease which)
  * @see #DBMap_impl
  * @see #db_fix_options(DBType,DBOptions)
  */
-DBMap* db_alloc(const char *file, const char *func, int32 line, DBType type, DBOptions options, unsigned short maxlen) {
+DBMap* db_alloc(const char *file, const char *func, int32 line, DBType type, DBOptions options, uint16 maxlen) {
 	DBMap_impl* db;
 	uint32 i;
 	char ers_name[50];

src/common/db.hpp

@@ -95,7 +95,7 @@ typedef enum DBRelease {
  * @see #db_default_cmp(DBType)
  * @see #db_default_hash(DBType)
  * @see #db_default_release(DBType,DBOptions)
- * @see #db_alloc(const char *,int32,DBType,DBOptions,unsigned short)
+ * @see #db_alloc(const char *,int32,DBType,DBOptions,uint16)
  */
 typedef enum DBType {
 	DB_INT,
@@ -125,7 +125,7 @@ typedef enum DBType {
  * @public
  * @see #db_fix_options(DBType,DBOptions)
  * @see #db_default_release(DBType,DBOptions)
- * @see #db_alloc(const char *,int32,DBType,DBOptions,unsigned short)
+ * @see #db_alloc(const char *,int32,DBType,DBOptions,uint16)
  */
 typedef enum DBOptions {
 	DB_OPT_BASE            = 0x00,
@@ -245,7 +245,7 @@ typedef int32 (*DBMatcher)(DBKey key, DBData data, va_list args);
  * @public
  * @see #db_default_cmp(DBType)
  */
-typedef int32 (*DBComparator)(DBKey key1, DBKey key2, unsigned short maxlen);
+typedef int32 (*DBComparator)(DBKey key1, DBKey key2, uint16 maxlen);
 
 /**
  * Format of the hashers used internally by the database system.
@@ -257,7 +257,7 @@ typedef int32 (*DBComparator)(DBKey key1, DBKey key2, unsigned short maxlen);
  * @public
  * @see #db_default_hash(DBType)
  */
-typedef uint64 (*DBHasher)(DBKey key, unsigned short maxlen);
+typedef uint64 (*DBHasher)(DBKey key, uint16 maxlen);
 
 /**
  * Format of the releaser used by the database system.
@@ -372,7 +372,7 @@ struct DBIterator
  * Public interface of a database. Only contains functions.
  * All the functions take the interface as the first argument.
  * @public
- * @see #db_alloc(const char*,int32,DBType,DBOptions,unsigned short)
+ * @see #db_alloc(const char*,int32,DBType,DBOptions,uint16)
  */
 struct DBMap {
 
@@ -826,7 +826,7 @@ DBReleaser db_custom_release(DBRelease which);
  * @see #db_default_release(DBType,DBOptions)
  * @see #db_fix_options(DBType,DBOptions)
  */
-DBMap* db_alloc(const char *file, const char *func, int32 line, DBType type, DBOptions options, unsigned short maxlen);
+DBMap* db_alloc(const char *file, const char *func, int32 line, DBType type, DBOptions options, uint16 maxlen);
 
 /**
  * Manual cast from 'int' to the union DBKey.

src/common/malloc.cpp

@@ -167,20 +167,20 @@ struct block {
 	struct block* block_next;		/* Then the allocated area */
 	struct block* unfill_prev;		/* The previous area not filled */
 	struct block* unfill_next;		/* The next area not filled */
-	unsigned short unit_size;		/* The size of the unit */
-	unsigned short unit_hash;		/* The hash of the unit */
-	unsigned short unit_count;		/* The number of units */
-	unsigned short unit_used;		/* The number of used units */
-	unsigned short unit_unfill;		/* The number of unused units */
-	unsigned short unit_maxused;	/* The maximum value of units used */
+	uint16 unit_size;				/* The size of the unit */
+	uint16 unit_hash;				/* The hash of the unit */
+	uint16 unit_count;				/* The number of units */
+	uint16 unit_used;				/* The number of used units */
+	uint16 unit_unfill;				/* The number of unused units */
+	uint16 unit_maxused;			/* The maximum value of units used */
 	char   data[ BLOCK_DATA_SIZE ];
 };
 
 struct unit_head {
 	struct block   *block;
 	const  char*   file;
-	unsigned short line;
-	unsigned short size;
+	uint16 line;
+	uint16 size;
 	long           checksum;
 };
 
@@ -197,26 +197,26 @@ struct unit_head_large {
 
 static struct unit_head_large *unit_head_large_first = nullptr;
 
-static struct block* block_malloc(unsigned short hash);
+static struct block* block_malloc(uint16 hash);
 static void          block_free(struct block* p);
 static size_t        memmgr_usage_bytes;
 
 #define block2unit(p, n) ((struct unit_head*)(&(p)->data[ p->unit_size * (n) ]))
 #define memmgr_assert(v) do { if(!(v)) { ShowError("Memory manager: assertion '" #v "' failed!\n"); } } while(0)
 
-static unsigned short size2hash( size_t size )
+static uint16 size2hash( size_t size )
 {
 	if( size <= BLOCK_DATA_SIZE1 ) {
-		return (unsigned short)(size + BLOCK_ALIGNMENT1 - 1) / BLOCK_ALIGNMENT1;
+		return (uint16)(size + BLOCK_ALIGNMENT1 - 1) / BLOCK_ALIGNMENT1;
 	} else if( size <= BLOCK_DATA_SIZE ){
-		return (unsigned short)(size - BLOCK_DATA_SIZE1 + BLOCK_ALIGNMENT2 - 1) / BLOCK_ALIGNMENT2
+		return (uint16)(size - BLOCK_DATA_SIZE1 + BLOCK_ALIGNMENT2 - 1) / BLOCK_ALIGNMENT2
 				+ BLOCK_DATA_COUNT1;
 	} else {
 		return 0xffff;	// If it exceeds the block length hash I do not
 	}
 }
 
-static size_t hash2size( unsigned short hash )
+static size_t hash2size( uint16 hash )
 {
 	if( hash <= BLOCK_DATA_COUNT1) {
 		return hash * BLOCK_ALIGNMENT1;
@@ -322,7 +322,7 @@ void* _mmalloc(size_t size, const char *file, int32 line, const char *func )
 	head->block = block;
 	head->file  = file;
 	head->line  = line;
-	head->size  = (unsigned short)size;
+	head->size  = (uint16)size;
 	*(long*)((char*)head + sizeof(struct unit_head) - sizeof(long) + size) = FREED_POINTER;
 	return (char *)head + sizeof(struct unit_head) - sizeof(long);
 }
@@ -436,14 +436,14 @@ void _mfree(void *ptr, const char *file, int32 line, const char *func )
 					hash_unfill[ block->unit_hash ] = block;
 				}
 				head->size     = block->unit_unfill;
-				block->unit_unfill = (unsigned short)(((uintptr_t)head - (uintptr_t)block->data) / block->unit_size);
+				block->unit_unfill = (uint16)(((uintptr_t)head - (uintptr_t)block->data) / block->unit_size);
 			}
 		}
 	}
 }
 
 /* Allocating blocks */
-static struct block* block_malloc(unsigned short hash)
+static struct block* block_malloc(uint16 hash)
 {
 	struct block *p;
 	if(hash_unfill[0] != nullptr) {
@@ -487,7 +487,7 @@ static struct block* block_malloc(unsigned short hash)
 	hash_unfill[ hash ] = p;
 	p->unfill_prev  = &block_head;
 	p->unfill_next  = nullptr;
-	p->unit_size    = (unsigned short)(hash2size( hash ) + sizeof(struct unit_head));
+	p->unit_size    = (uint16)(hash2size( hash ) + sizeof(struct unit_head));
 	p->unit_hash    = hash;
 	p->unit_count   = BLOCK_DATA_SIZE / p->unit_size;
 	p->unit_used    = 0;

src/common/mapindex.cpp

@@ -107,7 +107,7 @@ int32 mapindex_addmap(int32 index, const char* name) {
 	return index;
 }
 
-unsigned short mapindex_name2idx(const char* name, const char *func) {
+uint16 mapindex_name2idx(const char* name, const char *func) {
 	int32 i;
 	char map_name[MAP_NAME_LENGTH];
 	mapindex_getmapname(name, map_name);
@@ -120,7 +120,7 @@ unsigned short mapindex_name2idx(const char* name, const char *func) {
 	return 0;
 }
 
-const char* mapindex_idx2name(unsigned short id, const char *func) {
+const char* mapindex_idx2name(uint16 id, const char *func) {
 	if (id >= MAX_MAPINDEX || !mapindex_exists(id)) {
 		ShowDebug("(%s) mapindex_id2name: Requested name for non-existant map index [%d] in cache.\n", func, id);
 		return indexes[0].name; // dummy empty string so that the callee doesn't crash

src/common/mapindex.hpp

@@ -58,10 +58,10 @@
 const char* mapindex_getmapname(const char* string, char* output);
 const char* mapindex_getmapname_ext(const char* string, char* output);
 
-unsigned short mapindex_name2idx(const char* name, const char *func);
+uint16 mapindex_name2idx(const char* name, const char *func);
 #define mapindex_name2id(mapname) mapindex_name2idx((mapname), __FUNCTION__)
 
-const char* mapindex_idx2name(unsigned short id, const char *func);
+const char* mapindex_idx2name(uint16 id, const char *func);
 #define mapindex_id2name(mapindex) mapindex_idx2name((mapindex), __FUNCTION__)
 
 int32 mapindex_addmap(int32 index, const char* name);

src/common/mmo.hpp

@@ -374,7 +374,7 @@ struct s_point_str{
 
 struct startitem {
 	t_itemid nameid;
-	unsigned short amount;
+	uint16 amount;
 	uint32 pos;
 };
 
@@ -414,7 +414,7 @@ struct script_reg_str {
 
 //For saving status changes across sessions. [Skotlex]
 struct status_change_data {
-	unsigned short type; //SC_type
+	uint16 type; //SC_type
 	long val1, val2, val3, val4;
 	t_tick tick; //Remaining duration.
 };
@@ -554,7 +554,7 @@ struct s_friend {
 #ifdef HOTKEY_SAVING
 struct hotkey {
 	uint32 id;
-	unsigned short lv;
+	uint16 lv;
 	unsigned char type; // 0: item, 1: skill
 };
 #endif
@@ -593,8 +593,8 @@ struct mmo_charstatus {
 
 	char name[NAME_LENGTH];
 	uint32 base_level,job_level;
-	unsigned short str,agi,vit,int_,dex,luk;
-	unsigned short pow,sta,wis,spl,con,crt;
+	uint16 str,agi,vit,int_,dex,luk;
+	uint16 pow,sta,wis,spl,con,crt;
 	unsigned char slot,sex;
 
 	uint32 mapip;
@@ -688,7 +688,7 @@ struct auction_data {
 	char item_name[ITEM_NAME_LENGTH];
 	short type;
 
-	unsigned short hours;
+	uint16 hours;
 	int32 price, buynow;
 	time_t timestamp; // auction's end time
 	int32 auction_end_timer;
@@ -698,9 +698,9 @@ struct party_member {
 	uint32 account_id;
 	uint32 char_id;
 	char name[NAME_LENGTH];
-	unsigned short class_;
+	uint16 class_;
 	char map[MAP_NAME_LENGTH_EXT];
-	unsigned short lv;
+	uint16 lv;
 	unsigned leader : 1,
 	         online : 1;
 };
@@ -1152,7 +1152,7 @@ struct clan{
 	short max_member, connect_member;
 	map_session_data *members[MAX_CLAN];
 	struct clan_alliance alliance[MAX_CLANALLIANCE];
-	unsigned short instance_id;
+	uint16 instance_id;
 };
 
 // Sanity checks...

src/map/achievement.hpp

@@ -84,7 +84,7 @@ struct s_achievement_db {
 	int16 mapindex;
 	struct ach_reward {
 		t_itemid nameid;
-		unsigned short amount;
+		uint16 amount;
 		struct script_code *script;
 		uint32 title_id;
 		ach_reward();

src/map/atcommand.cpp

@@ -581,7 +581,7 @@ static void warp_get_suggestions(map_session_data* sd, const char *name) {
 ACMD_FUNC(mapmove)
 {
 	char map_name[MAP_NAME_LENGTH_EXT];
-	unsigned short mapindex;
+	uint16 mapindex;
 	short x = 0, y = 0;
 	int16 m = -1;
 
@@ -4540,7 +4540,7 @@ ACMD_FUNC(mapinfo) {
 	struct chat_data *cd = nullptr;
 	char direction[12];
 	int32 i, m_id, chat_num = 0, list = 0, vend_num = 0;
-	unsigned short m_index;
+	uint16 m_index;
 	char mapname[MAP_NAME_LENGTH];
 
 	nullpo_retr(-1, sd);
@@ -6007,7 +6007,7 @@ ACMD_FUNC(addwarp)
 {
 	char mapname[MAP_NAME_LENGTH_EXT], warpname[NPC_NAME_LENGTH];
 	short x,y;
-	unsigned short m;
+	uint16 m;
 	struct npc_data* nd;
 
 	nullpo_retr(-1, sd);
@@ -10630,7 +10630,7 @@ ACMD_FUNC(costume) {
 		SC_HANBOK,
 		SC_OKTOBERFEST
 	};
-	unsigned short k = 0, len = ARRAYLENGTH(names);
+	uint16 k = 0, len = ARRAYLENGTH(names);
 
 	if( !message || !*message ) {
 		for( k = 0; k < len; k++ ) {

src/map/battle.cpp

@@ -274,7 +274,7 @@ struct block_list* battle_getenemyarea(struct block_list *src, int32 x, int32 y,
 * @param tick: Current tick
 * @return HP+SP+AP (0 if HP/SP/AP remained unchanged)
 */
-int32 battle_damage(struct block_list *src, struct block_list *target, int64 damage, t_tick delay, uint16 skill_lv, uint16 skill_id, enum damage_lv dmg_lv, unsigned short attack_type, bool additional_effects, t_tick tick, bool isspdamage) {
+int32 battle_damage(struct block_list *src, struct block_list *target, int64 damage, t_tick delay, uint16 skill_lv, uint16 skill_id, enum damage_lv dmg_lv, uint16 attack_type, bool additional_effects, t_tick tick, bool isspdamage) {
 	int32 dmg_change;
 	map_session_data* sd = nullptr;
 	if (src)
@@ -318,11 +318,11 @@ struct delay_damage {
 	int32 target_id;
 	int64 damage;
 	t_tick delay;
-	unsigned short distance;
+	uint16 distance;
 	uint16 skill_lv;
 	uint16 skill_id;
 	enum damage_lv dmg_lv;
-	unsigned short attack_type;
+	uint16 attack_type;
 	bool additional_effects;
 	enum bl_type src_type;
 	bool isspdamage;
@@ -2446,7 +2446,7 @@ static int32 battle_calc_base_weapon_attack(struct block_list *src, struct statu
  *	Initial refactoring by Baalberith
  *	Refined and optimized by helvetica
  */
-static int64 battle_calc_base_damage(struct block_list *src, struct status_data *status, struct weapon_atk *wa, status_change *sc, unsigned short t_size, int32 flag)
+static int64 battle_calc_base_damage(struct block_list *src, struct status_data *status, struct weapon_atk *wa, status_change *sc, uint16 t_size, int32 flag)
 {
 	uint32 atkmin = 0, atkmax = 0;
 	short type = 0;
@@ -4497,7 +4497,7 @@ static void battle_calc_multi_attack(struct Damage* wd, struct block_list *src,s
  * @param sc: Object's status change information
  * @return atkpercent with cap_value(watk,0,USHRT_MAX)
  */
-static unsigned short battle_get_atkpercent(struct block_list& bl, uint16 skill_id, status_change& sc)
+static uint16 battle_get_atkpercent(struct block_list& bl, uint16 skill_id, status_change& sc)
 {
 	if (bl.type == BL_PC && !battle_skill_stacks_masteries_vvs(skill_id, BCHK_ALL))
 		return 100;
@@ -4538,7 +4538,7 @@ static unsigned short battle_get_atkpercent(struct block_list& bl, uint16 skill_
 	* MH_VOLCANIC_ASH (-50)
 	*/
 
-	return (unsigned short)cap_value(atkpercent, 0, USHRT_MAX);
+	return (uint16)cap_value(atkpercent, 0, USHRT_MAX);
 }
 
 /*======================================================

src/map/battle.hpp

@@ -122,7 +122,7 @@ int64 battle_calc_gvg_damage(struct block_list *src,struct block_list *bl,int64
 int64 battle_calc_bg_damage(struct block_list *src,struct block_list *bl,int64 damage,uint16 skill_id,int32 flag);
 int64 battle_calc_pk_damage(block_list &src, block_list &bl, int64 damage, uint16 skill_id, int32 flag);
 
-int32 battle_damage(struct block_list *src, struct block_list *target, int64 damage, t_tick delay, uint16 skill_lv, uint16 skill_id, enum damage_lv dmg_lv, unsigned short attack_type, bool additional_effects, t_tick tick, bool spdamage);
+int32 battle_damage(struct block_list *src, struct block_list *target, int64 damage, t_tick delay, uint16 skill_lv, uint16 skill_id, enum damage_lv dmg_lv, uint16 attack_type, bool additional_effects, t_tick tick, bool spdamage);
 int32 battle_delay_damage (t_tick tick, int32 amotion, struct block_list *src, struct block_list *target, int32 attack_type, uint16 skill_id, uint16 skill_lv, int64 damage, enum damage_lv dmg_lv, t_tick ddelay, bool additional_effects, bool spdamage);
 int32 battle_fix_damage(struct block_list* src, struct block_list* target, int64 damage, t_tick walkdelay, uint16 skill_id);
 

src/map/battleground.cpp

@@ -482,7 +482,7 @@ bool bg_team_delete(int32 bg_id)
  * @param y: Y coordinate
  * @return True on success or false otherwise
  */
-bool bg_team_warp(int32 bg_id, unsigned short mapindex, short x, short y)
+bool bg_team_warp(int32 bg_id, uint16 mapindex, short x, short y)
 {
 	std::shared_ptr<s_battleground_data> bgteam = util::umap_find(bg_team_db, bg_id);
 

src/map/battleground.hpp

@@ -15,7 +15,7 @@
 #define MAX_BG_MEMBERS 30
 
 struct s_battleground_member_data {
-	unsigned short x, y;
+	uint16 x, y;
 	map_session_data *sd;
 	unsigned afk : 1;
 	struct point entry_point; ///< Battleground queue entry point
@@ -140,7 +140,7 @@ int32 bg_create(uint16 mapindex, s_battleground_team* team);
 bool bg_team_join(int32 bg_id, map_session_data *sd, bool is_queue);
 bool bg_team_delete(int32 bg_id);
 int32 bg_team_leave(map_session_data *sd, bool quit, bool deserter);
-bool bg_team_warp(int32 bg_id, unsigned short mapindex, short x, short y);
+bool bg_team_warp(int32 bg_id, uint16 mapindex, short x, short y);
 bool bg_player_is_in_bg_map(map_session_data *sd);
 bool bg_queue_check_joinable(std::shared_ptr<s_battleground_type> bg, map_session_data *sd, const char *name);
 void bg_queue_join_solo(const char *name, map_session_data *sd);

src/map/buyingstore.hpp

@@ -16,7 +16,7 @@ class map_session_data;
 struct s_buyingstore_item
 {
 	int32 price;
-	unsigned short amount;
+	uint16 amount;
 	t_itemid nameid;
 };
 

src/map/cashshop.cpp

@@ -548,7 +548,7 @@ bool cashshop_buylist( map_session_data* sd, uint32 kafrapoints, int32 n, const
 		if (!id)
 			continue;
 
-		unsigned short get_amt = quantity;
+		uint16 get_amt = quantity;
 
 		if (id->flag.guid || !itemdb_isstackable2(id))
 			get_amt = 1;

src/map/channel.cpp

@@ -1251,7 +1251,7 @@ int32 channel_pcsetopt(map_session_data *sd, char *chname, const char *option, c
  * @return True on success or false on failure
  */
 bool channel_pccheckgroup(struct Channel *channel, int32 group_id) {
-	unsigned short i;
+	uint16 i;
 
 	nullpo_ret(channel);
 
@@ -1372,7 +1372,7 @@ bool channel_read_sub(config_setting_t *chan, struct Channel *tmp_chan, uint8 i)
 
 	if ((group_list = config_setting_get_member(chan, "groupid")) && (group_count = config_setting_length(group_list)) > 0) {
 		int32 j;
-		CREATE(tmp_chan->groups, unsigned short, group_count);
+		CREATE(tmp_chan->groups, uint16, group_count);
 		tmp_chan->group_count = group_count;
 		for (j = 0; j < group_count; j++) {
 			int32 groupid = config_setting_get_int_elem(group_list, j);

src/map/channel.hpp

@@ -38,21 +38,21 @@ enum Channel_Type {
 };
 
 struct Channel {
-	//unsigned short id;			  ///< Channel ID (unused yet)
+	//uint16 id;			  ///< Channel ID (unused yet)
 	char name[CHAN_NAME_LENGTH];  ///< Channel Name
 	char pass[CHAN_NAME_LENGTH];  ///< Password
 	char alias[CHAN_NAME_LENGTH]; ///< Channel display name
 	enum Channel_Type type;		  ///< Channel type @see enum Channel_Type
 	unsigned long color;		  ///< Channel color in BGR
 	unsigned char opt;			  ///< Channel options @see enum Channel_Opt
-	unsigned short msg_delay;	  ///< Chat delay in miliseconds
+	uint16 msg_delay;	  ///< Chat delay in miliseconds
 	uint32 char_id;		  ///< If CHAN_TYPE_PRIVATE, owner is char_id of channel creator
 	uint16 m;					  ///< If CHAN_TYPE_MAP, owner is map id
 	int32 gid;					  ///< If CHAN_TYPE_ALLY, owner is first logged guild_id
 	DBMap *users;				  ///< List of users
 	DBMap *banned;				  ///< List of banned chars -> char_id
-	unsigned short group_count;	  ///< Number of group id
-	unsigned short *groups;		  ///< List of group id, only these groups can join the channel
+	uint16 group_count;	  ///< Number of group id
+	uint16 *groups;		  ///< List of group id, only these groups can join the channel
 };
 
 struct chan_banentry {
@@ -71,7 +71,7 @@ struct Channel_Config {
 		unsigned char opt;			 ///< Options @see enum Channel_Opt
 		unsigned long color;		 ///< Default color
 		uint32 delay;			 ///< Message delay
-		unsigned short max_member;	 ///< Max member for each channel
+		uint16 max_member;	 ///< Max member for each channel
 		unsigned allow : 1;			 ///< Allow private channel creation?
 		unsigned ban : 1;			 ///< Allow player to ban
 		unsigned kick : 1;			 ///< Allow player to kick

src/map/clif.cpp

@@ -170,7 +170,7 @@ static inline uint16 client_nameid( t_itemid server_nameid ){
 }
 #endif
 
-static inline void WBUFPOS(uint8* p, unsigned short pos, short x, short y, unsigned char dir) {
+static inline void WBUFPOS(uint8* p, uint16 pos, short x, short y, unsigned char dir) {
 	p += pos;
 	p[0] = (uint8)(x>>2);
 	p[1] = (uint8)((x<<6) | ((y>>4)&0x3f));
@@ -179,7 +179,7 @@ static inline void WBUFPOS(uint8* p, unsigned short pos, short x, short y, unsig
 
 
 // client-side: x0+=sx0*0.0625-0.5 and y0+=sy0*0.0625-0.5
-static inline void WBUFPOS2(uint8* p, unsigned short pos, short x0, short y0, short x1, short y1, uint8 sx0, uint8 sy0) {
+static inline void WBUFPOS2(uint8* p, uint16 pos, short x0, short y0, short x1, short y1, uint8 sx0, uint8 sy0) {
 	p += pos;
 	p[0] = (uint8)(x0>>2);
 	p[1] = (uint8)((x0<<6) | ((y0>>4)&0x3f));
@@ -190,11 +190,11 @@ static inline void WBUFPOS2(uint8* p, unsigned short pos, short x0, short y0, sh
 }
 
 
-static inline void WFIFOPOS(int32 fd, unsigned short pos, short x, short y, unsigned char dir) {
+static inline void WFIFOPOS(int32 fd, uint16 pos, short x, short y, unsigned char dir) {
 	WBUFPOS(WFIFOP(fd,pos), 0, x, y, dir);
 }
 
-static inline void RBUFPOS(const uint8* p, unsigned short pos, short* x, short* y, unsigned char* dir) {
+static inline void RBUFPOS(const uint8* p, uint16 pos, short* x, short* y, unsigned char* dir) {
 	p += pos;
 
 	if( x ) {
@@ -211,7 +211,7 @@ static inline void RBUFPOS(const uint8* p, unsigned short pos, short* x, short*
 }
 
 
-static inline void RBUFPOS2(const uint8* p, unsigned short pos, short* x0, short* y0, short* x1, short* y1, unsigned char* sx0, unsigned char* sy0) {
+static inline void RBUFPOS2(const uint8* p, uint16 pos, short* x0, short* y0, short* x1, short* y1, unsigned char* sx0, unsigned char* sy0) {
 	p += pos;
 
 	if( x0 ) {
@@ -240,12 +240,12 @@ static inline void RBUFPOS2(const uint8* p, unsigned short pos, short* x0, short
 }
 
 
-static inline void RFIFOPOS(int32 fd, unsigned short pos, short* x, short* y, unsigned char* dir) {
+static inline void RFIFOPOS(int32 fd, uint16 pos, short* x, short* y, unsigned char* dir) {
 	RBUFPOS(RFIFOP(fd,pos), 0, x, y, dir);
 }
 
 
-static inline void RFIFOPOS2(int32 fd, unsigned short pos, short* x0, short* y0, short* x1, short* y1, unsigned char* sx0, unsigned char* sy0) {
+static inline void RFIFOPOS2(int32 fd, uint16 pos, short* x0, short* y0, short* x1, short* y1, unsigned char* sx0, unsigned char* sy0) {
 	RBUFPOS2(WFIFOP(fd,pos), 0, x0, y0, x1, y1, sx0, sy0);
 }
 
@@ -6654,7 +6654,7 @@ void clif_displaymessage(const int32 fd, const char* mes)
 		/** so we redirect to ZC_NPC_CHAT **/
 		//clif_messagecolor(&sd->bl, color_table[COLOR_DEFAULT], mes, false, SELF);
 			unsigned long color = (color_table[COLOR_DEFAULT] & 0x0000FF) << 16 | (color_table[COLOR_DEFAULT] & 0x00FF00) | (color_table[COLOR_DEFAULT] & 0xFF0000) >> 16; // RGB to BGR
-			unsigned short len = strnlen(line, CHAT_SIZE_MAX);
+			uint16 len = strnlen(line, CHAT_SIZE_MAX);
 
 			if (len > 0) { 
 				WFIFOHEAD(fd, 13 + len);
@@ -6781,13 +6781,13 @@ void clif_broadcast2(struct block_list* bl, const char* mes, size_t len, unsigne
 void clif_channel_msg(struct Channel *channel, const char *msg, unsigned long color) {
 	DBIterator *iter;
 	map_session_data *user;
-	unsigned short msg_len = 0, len = 0;
+	uint16 msg_len = 0, len = 0;
 	unsigned char buf[CHAT_SIZE_MAX];
 
 	if (!channel || !msg)
 		return;
 
-	msg_len = (unsigned short)(strlen(msg) + 1);
+	msg_len = (uint16)(strlen(msg) + 1);
 
 	if( msg_len > sizeof(buf)-12 ) {
 		ShowWarning("clif_channel_msg: Truncating too long message '%s' (len=%u).\n", msg, msg_len);
@@ -9753,7 +9753,7 @@ void clif_specialeffect_remove(struct block_list* bl_src, int32 effect, enum sen
 /// Monster/NPC color chat [SnakeDrak] (ZC_NPC_CHAT).
 /// 02c1 <packet len>.W <id>.L <color>.L <message>.?B
 void clif_messagecolor_target(struct block_list *bl, unsigned long color, const char *msg, bool rgb2bgr, enum send_target type, map_session_data *sd) {
-	unsigned short msg_len = (unsigned short)(strlen(msg) + 1);
+	uint16 msg_len = (uint16)(strlen(msg) + 1);
 	uint8 buf[CHAT_SIZE_MAX];
 
 	nullpo_retv(bl);
@@ -10351,7 +10351,7 @@ void clif_viewequip_ack( map_session_data& sd, map_session_data& tsd ){
 
 /// Display msgstringtable.txt string (ZC_MSG).
 /// 0291 <message>.W
-void clif_msg(map_session_data* sd, unsigned short id)
+void clif_msg(map_session_data* sd, uint16 id)
 {
 	int32 fd;
 	nullpo_retv(sd);
@@ -10366,7 +10366,7 @@ void clif_msg(map_session_data* sd, unsigned short id)
 
 /// Display msgstringtable.txt string and fill in a valid for %d format (ZC_MSG_VALUE).
 /// 0x7e2 <message>.W <value>.L
-void clif_msg_value(map_session_data* sd, unsigned short id, int32 value)
+void clif_msg_value(map_session_data* sd, uint16 id, int32 value)
 {
 	int32 fd = sd->fd;
 
@@ -11214,7 +11214,7 @@ void clif_parse_Hotkey(int32 fd, map_session_data *sd) {
 #ifdef HOTKEY_SAVING
 #if PACKETVER_MAIN_NUM >= 20190522 || PACKETVER_RE_NUM >= 20190508 || PACKETVER_ZERO_NUM >= 20190605
 	const PACKET_CZ_SHORTCUT_KEY_CHANGE2* p = reinterpret_cast<PACKET_CZ_SHORTCUT_KEY_CHANGE2*>( RFIFOP( fd, 0 ) );
-	const unsigned short idx = p->index + p->tab * MAX_HOTKEYS;
+	const uint16 idx = p->index + p->tab * MAX_HOTKEYS;
 
 	if( idx >= MAX_HOTKEYS_DB ){
 		return;
@@ -11225,7 +11225,7 @@ void clif_parse_Hotkey(int32 fd, map_session_data *sd) {
 	sd->status.hotkeys[idx].lv = p->hotkey.count;
 #elif PACKETVER_MAIN_NUM >= 20070618 || defined(PACKETVER_RE) || defined(PACKETVER_ZERO) || PACKETVER_AD_NUM >= 20070618 || PACKETVER_SAK_NUM >= 20070618
 	const PACKET_CZ_SHORTCUT_KEY_CHANGE1* p = reinterpret_cast<PACKET_CZ_SHORTCUT_KEY_CHANGE1*>( RFIFOP( fd, 0 ) );
-	const unsigned short idx = p->index;
+	const uint16 idx = p->index;
 
 	if( idx >= MAX_HOTKEYS_DB ){
 		return;
@@ -18867,7 +18867,7 @@ void clif_parse_ItemListWindowSelected(int32 fd, map_session_data* sd) {
 	int32 n = (RFIFOW(fd,info->pos[0])-12) / 4;
 	int32 type = RFIFOL(fd,info->pos[1]);
 	int32 flag = RFIFOL(fd,info->pos[2]); // Button clicked: 0 = Cancel, 1 = OK
-	unsigned short* item_list = (unsigned short*)RFIFOP(fd,info->pos[3]);
+	uint16* item_list = (uint16*)RFIFOP(fd,info->pos[3]);
 
 	if( sd->state.trading || sd->npc_shopid )
 		return;
@@ -19016,7 +19016,7 @@ static void clif_parse_ReqOpenBuyingStore( int32 fd, map_session_data* sd ){
 ///     2 = "Total amount of then possessed items exceeds the weight limit by <weight/10-maxweight*90%>. Please re-enter." (0x6ce, MSI_BUYINGSTORE_OVERWEIGHT)
 ///     8 = "No sale (purchase) information available." (0x705)
 ///     ? = nothing
-void clif_buyingstore_open_failed(map_session_data* sd, unsigned short result, uint32 weight)
+void clif_buyingstore_open_failed(map_session_data* sd, uint16 result, uint32 weight)
 {
 	int32 fd = sd->fd;
 
@@ -19191,7 +19191,7 @@ void clif_buyingstore_trade_failed_buyer(map_session_data* sd, short result)
 /// Updates the zeny limit and an item in the buying store item list.
 /// 081b <name id>.W <amount>.W <limit zeny>.L (ZC_UPDATE_ITEM_FROM_BUYING_STORE)
 /// 09e6 <name id>.W <amount>.W <zeny>.L <limit zeny>.L <GID>.L <Date>.L (ZC_UPDATE_ITEM_FROM_BUYING_STORE2)
-void clif_buyingstore_update_item( map_session_data* sd, t_itemid nameid, unsigned short amount, uint32 char_id, int32 zeny ){
+void clif_buyingstore_update_item( map_session_data* sd, t_itemid nameid, uint16 amount, uint32 char_id, int32 zeny ){
 	PACKET_ZC_UPDATE_ITEM_FROM_BUYING_STORE p = {};
 
 	p.packetType = buyingStoreUpdateItemType;
@@ -19214,7 +19214,7 @@ void clif_buyingstore_update_item( map_session_data* sd, t_itemid nameid, unsign
 ///     "%s (%d) were sold at %dz." (0x6d2, MSI_BUYINGSTORE_TRADE_SELLCOMPLETE)
 ///
 /// NOTE:   This function has to be called _instead_ of clif_delitem/clif_dropitem.
-void clif_buyingstore_delete_item(map_session_data* sd, short index, unsigned short amount, int32 price)
+void clif_buyingstore_delete_item(map_session_data* sd, short index, uint16 amount, int32 price)
 {
 	int32 fd = sd->fd;
 
@@ -20777,7 +20777,7 @@ static void clif_roulette_recvitem_ack(map_session_data *sd, enum RECV_ROULETTE_
 static uint8 clif_roulette_getitem(map_session_data *sd) {
 	struct item it;
 	uint8 res = 1;
-	unsigned short factor = 1;
+	uint16 factor = 1;
 
 	nullpo_retr(1, sd);
 
@@ -20978,7 +20978,7 @@ void clif_merge_item_ack( map_session_data &sd, enum MERGE_ITEM_ACK type, uint16
  **/
 static bool clif_merge_item_has_pair(map_session_data *sd, struct item *it) {
 	struct item *it_;
-	unsigned short i;
+	uint16 i;
 
 	nullpo_retr(false, sd);
 

src/map/clif.hpp

@@ -1197,8 +1197,8 @@ void clif_configuration( map_session_data* sd, enum e_config_type type, bool ena
 void clif_viewequip_ack( map_session_data& sd, map_session_data& tsd );
 void clif_equipcheckbox(map_session_data* sd);
 
-void clif_msg(map_session_data* sd, unsigned short id);
-void clif_msg_value(map_session_data* sd, unsigned short id, int32 value);
+void clif_msg(map_session_data* sd, uint16 id);
+void clif_msg_value(map_session_data* sd, uint16 id, int32 value);
 void clif_msg_skill(map_session_data* sd, uint16 skill_id, int32 msg_id);
 void clif_msg_color( map_session_data* sd, uint16 msg_id, uint32 color );
 
@@ -1289,14 +1289,14 @@ void clif_showdigit(map_session_data* sd, unsigned char type, int32 value);
 
 /// Buying Store System
 void clif_buyingstore_open(map_session_data* sd);
-void clif_buyingstore_open_failed(map_session_data* sd, unsigned short result, uint32 weight);
+void clif_buyingstore_open_failed(map_session_data* sd, uint16 result, uint32 weight);
 void clif_buyingstore_myitemlist( map_session_data& sd );
 void clif_buyingstore_entry( map_session_data& sd, struct block_list* tbl = nullptr );
 void clif_buyingstore_disappear_entry( map_session_data& sd, struct block_list* tbl = nullptr );
 void clif_buyingstore_itemlist( map_session_data& sd, map_session_data& pl_sd );
 void clif_buyingstore_trade_failed_buyer(map_session_data* sd, short result);
-void clif_buyingstore_update_item(map_session_data* sd, t_itemid nameid, unsigned short amount, uint32 char_id, int32 zeny);
-void clif_buyingstore_delete_item(map_session_data* sd, short index, unsigned short amount, int32 price);
+void clif_buyingstore_update_item(map_session_data* sd, t_itemid nameid, uint16 amount, uint32 char_id, int32 zeny);
+void clif_buyingstore_delete_item(map_session_data* sd, short index, uint16 amount, int32 price);
 void clif_buyingstore_trade_failed_seller(map_session_data* sd, short result, t_itemid nameid);
 
 /// Search Store System

src/map/guild.cpp

@@ -197,7 +197,7 @@ static TIMER_FUNC(guild_send_xy_timer);
 
 /* guild flags cache */
 struct npc_data **guild_flags;
-unsigned short guild_flags_count;
+uint16 guild_flags_count;
 
 /**
  * Get guild skill index in guild structure of mmo.hpp

src/map/homunculus.hpp

@@ -44,7 +44,7 @@ public:
 
 struct s_hom_stats {
 	uint32 HP, SP;
-	unsigned short str, agi, vit, int_, dex, luk;
+	uint16 str, agi, vit, int_, dex, luk;
 };
 
 /// Homunculus skill entry [Celest]

src/map/intif.cpp

@@ -570,7 +570,7 @@ bool intif_send_guild_storage(uint32 account_id, struct s_storage *gstor)
 		return false;
 	WFIFOHEAD(inter_fd,sizeof(struct s_storage)+12);
 	WFIFOW(inter_fd,0) = 0x3019;
-	WFIFOW(inter_fd,2) = (unsigned short)sizeof(struct s_storage)+12;
+	WFIFOW(inter_fd,2) = (uint16)sizeof(struct s_storage)+12;
 	WFIFOL(inter_fd,4) = account_id;
 	WFIFOL(inter_fd,8) = gstor->id;
 	memcpy( WFIFOP(inter_fd,12),gstor, sizeof(struct s_storage) );
@@ -3394,7 +3394,7 @@ void intif_parse_itembound_ack(int32 fd) {
  * @author [Cydh]
  */
 void intif_parse_itembound_store2gstorage(int32 fd) {
-	unsigned short i, failed = 0;
+	uint16 i, failed = 0;
 	short count = RFIFOW(fd, 4), guild_id = RFIFOW(fd, 6);
 	struct s_storage *gstor = guild2storage(guild_id);
 

src/map/itemdb.cpp

@@ -3888,7 +3888,7 @@ bool itemdb_parse_roulette_db(void)
 		for (k = 0; k < limit && SQL_SUCCESS == Sql_NextRow(mmysql_handle); k++) {
 			char* data;
 			t_itemid item_id;
-			unsigned short amount;
+			uint16 amount;
 			int32 level, flag;
 
 			Sql_GetData(mmysql_handle, 1, &data, nullptr); level = atoi(data);
@@ -3911,7 +3911,7 @@ bool itemdb_parse_roulette_db(void)
 
 			j = rd.items[i];
 			RECREATE(rd.nameid[i], t_itemid, ++rd.items[i]);
-			RECREATE(rd.qty[i], unsigned short, rd.items[i]);
+			RECREATE(rd.qty[i], uint16, rd.items[i]);
 			RECREATE(rd.flag[i], int32, rd.items[i]);
 
 			rd.nameid[i][j] = item_id;
@@ -3942,7 +3942,7 @@ bool itemdb_parse_roulette_db(void)
 
 		rd.items[i] = limit;
 		RECREATE(rd.nameid[i], t_itemid, rd.items[i]);
-		RECREATE(rd.qty[i], unsigned short, rd.items[i]);
+		RECREATE(rd.qty[i], uint16, rd.items[i]);
 		RECREATE(rd.flag[i], int32, rd.items[i]);
 
 		for (j = 0; j < MAX_ROULETTE_COLUMNS - i; j++) {

src/map/itemdb.hpp

@@ -3174,7 +3174,7 @@ struct s_item_group_db
 /// Struct of Roulette db
 struct s_roulette_db {
 	t_itemid *nameid[MAX_ROULETTE_LEVEL]; /// Item ID
-	unsigned short *qty[MAX_ROULETTE_LEVEL]; /// Amount of Item ID
+	uint16 *qty[MAX_ROULETTE_LEVEL]; /// Amount of Item ID
 	int32 *flag[MAX_ROULETTE_LEVEL]; /// Whether the item is for loss or win
 	int32 items[MAX_ROULETTE_LEVEL]; /// Number of items in the list for each
 };

src/map/log.cpp

@@ -528,7 +528,7 @@ void log_cash( map_session_data* sd, e_log_pick_type type, e_log_cash_type cash_
  **/
 void log_feeding(map_session_data *sd, e_log_feeding_type type, t_itemid nameid) {
 	uint32 target_id = 0, intimacy = 0;
-	unsigned short target_class = 0;
+	uint16 target_class = 0;
 
 	nullpo_retv( sd );
 

src/map/map.cpp

@@ -1895,7 +1895,7 @@ bool map_closest_freecell(int16 m, int16 *x, int16 *y, int32 type, int32 flag)
  * @param type: types of block the item should not stack on
  * @return 0:failure, x:item_gid [MIN_FLOORITEM;MAX_FLOORITEM]==[2;START_ACCOUNT_NUM]
  *------------------------------------------*/
-int32 map_addflooritem(struct item *item, int32 amount, int16 m, int16 x, int16 y, int32 first_charid, int32 second_charid, int32 third_charid, int32 flags, unsigned short mob_id, bool canShowEffect, enum directions dir, int32 type)
+int32 map_addflooritem(struct item *item, int32 amount, int16 m, int16 x, int16 y, int32 first_charid, int32 second_charid, int32 third_charid, int32 flags, uint16 mob_id, bool canShowEffect, enum directions dir, int32 type)
 {
 	struct flooritem_data *fitem = nullptr;
 
@@ -2864,7 +2864,7 @@ int32 map_delinstancemap(int32 m)
  *-----------------------------------------*/
 // Stores the spawn data entry in the mob list.
 // Returns the index of successful, or -1 if the list was full.
-int32 map_addmobtolist(unsigned short m, struct spawn_data *spawn)
+int32 map_addmobtolist(uint16 m, struct spawn_data *spawn)
 {
 	size_t i;
 	struct map_data *mapdata = map_getmapdata(m);
@@ -3006,7 +3006,7 @@ const char* map_mapid2mapname(int32 m)
  *------------------------------------------*/
 int16 map_mapname2mapid(const char* name)
 {
-	unsigned short map_index;
+	uint16 map_index;
 	map_index = mapindex_name2id(name);
 	if (!map_index)
 		return -1;
@@ -3016,7 +3016,7 @@ int16 map_mapname2mapid(const char* name)
 /*==========================================
  * Returns the map of the given mapindex. [Skotlex]
  *------------------------------------------*/
-int16 map_mapindex2mapid(unsigned short mapindex)
+int16 map_mapindex2mapid(uint16 mapindex)
 {
 	struct map_data *md=nullptr;
 
@@ -3032,7 +3032,7 @@ int16 map_mapindex2mapid(unsigned short mapindex)
 /*==========================================
  * Switching Ip, port ? (like changing map_server) get ip/port from map_name
  *------------------------------------------*/
-int32 map_mapname2ipport(unsigned short name, uint32* ip, uint16* port)
+int32 map_mapname2ipport(uint16 name, uint32* ip, uint16* port)
 {
 	struct map_data_other_server *mdos;
 
@@ -3444,7 +3444,7 @@ bool map_iwall_remove(const char *wall_name)
 static DBData create_map_data_other_server(DBKey key, va_list args)
 {
 	struct map_data_other_server *mdos;
-	unsigned short mapindex = (unsigned short)key.ui;
+	uint16 mapindex = (uint16)key.ui;
 	mdos=(struct map_data_other_server *)aCalloc(1,sizeof(struct map_data_other_server));
 	mdos->index = mapindex;
 	memcpy(mdos->name, mapindex_id2name(mapindex), MAP_NAME_LENGTH);
@@ -3454,7 +3454,7 @@ static DBData create_map_data_other_server(DBKey key, va_list args)
 /*==========================================
  * Add mapindex to db of another map server
  *------------------------------------------*/
-int32 map_setipport(unsigned short mapindex, uint32 ip, uint16 port)
+int32 map_setipport(uint16 mapindex, uint32 ip, uint16 port)
 {
 	struct map_data_other_server *mdos;
 
@@ -3495,7 +3495,7 @@ int32 map_eraseallipport(void)
 /*==========================================
  * Delete mapindex from db of another map server
  *------------------------------------------*/
-int32 map_eraseipport(unsigned short mapindex, uint32 ip, uint16 port)
+int32 map_eraseipport(uint16 mapindex, uint32 ip, uint16 port)
 {
 	struct map_data_other_server *mdos;
 
@@ -3828,7 +3828,7 @@ int32 map_readallmaps (void)
 	for (int32 i = 0; i < map_num; i++) {
 		size_t size;
 		bool success = false;
-		unsigned short idx = 0;
+		uint16 idx = 0;
 		struct map_data *mapdata = &map[i];
 		char map_cache_decode_buffer[MAX_MAP_SIZE];
 

src/map/map.hpp

@@ -460,10 +460,10 @@ struct block_list {
 // Expanded to specify all mob-related spawn data by [Skotlex]
 struct spawn_data {
 	short id; //ID, used because a mob can change it's class
-	unsigned short m, x, y;	//Spawn information (map, point, spawn-area around point)
+	uint16 m, x, y;	//Spawn information (map, point, spawn-area around point)
 	signed short xs, ys;
-	unsigned short num; //Number of mobs using this structure
-	unsigned short active;//Number of mobs that are already spawned (for mob_remove_damaged: no)
+	uint16 num; //Number of mobs using this structure
+	uint16 active;//Number of mobs that are already spawned (for mob_remove_damaged: no)
 	uint32 delay1, delay2; //Spawn delay (fixed base + random variance)
 	uint32 level;
 	struct {
@@ -483,7 +483,7 @@ struct flooritem_data {
 	int32 first_get_charid,second_get_charid,third_get_charid;
 	t_tick first_get_tick,second_get_tick,third_get_tick;
 	struct item item;
-	unsigned short mob_id; ///< ID of monster who dropped it. 0 for non-monster who dropped it.
+	uint16 mob_id; ///< ID of monster who dropped it. 0 for non-monster who dropped it.
 };
 
 enum _sp {
@@ -842,7 +842,7 @@ struct map_data {
 	std::vector<int> qi_npc;
 
 	/* speeds up clif_updatestatus processing by causing hpmeter to run only when someone with the permission can view it */
-	unsigned short hpmeter_visible;
+	uint16 hpmeter_visible;
 #ifdef MAP_GENERATOR
 	struct {
 		std::vector<const struct npc_data *> npcs;
@@ -864,7 +864,7 @@ private:
 /// Beginning of data structure matches 'map_data', to allow typecasting.
 struct map_data_other_server {
 	char name[MAP_NAME_LENGTH];
-	unsigned short index; //Index is the map index used by the mapindex* functions.
+	uint16 index; //Index is the map index used by the mapindex* functions.
 	struct mapcell* cell; // If this is nullptr, the map is not on this map-server
 	uint32 ip;
 	uint16 port;
@@ -1144,7 +1144,7 @@ bool map_addnpc(int16 m,struct npc_data *);
 TIMER_FUNC(map_clearflooritem_timer);
 TIMER_FUNC(map_removemobs_timer);
 void map_clearflooritem(struct block_list* bl);
-int32 map_addflooritem(struct item *item, int32 amount, int16 m, int16 x, int16 y, int32 first_charid, int32 second_charid, int32 third_charid, int32 flags, unsigned short mob_id, bool canShowEffect = false, enum directions dir = DIR_MAX, int32 type = BL_NUL);
+int32 map_addflooritem(struct item *item, int32 amount, int16 m, int16 x, int16 y, int32 first_charid, int32 second_charid, int32 third_charid, int32 flags, uint16 mob_id, bool canShowEffect = false, enum directions dir = DIR_MAX, int32 type = BL_NUL);
 
 // instances
 int32 map_addinstancemap(int32 src_m, int32 instance_id, bool no_mapflag);
@@ -1172,11 +1172,11 @@ bool map_blid_exists( int32 id );
 
 #define map_id2index(id) map[(id)].index
 const char* map_mapid2mapname(int32 m);
-int16 map_mapindex2mapid(unsigned short mapindex);
+int16 map_mapindex2mapid(uint16 mapindex);
 int16 map_mapname2mapid(const char* name);
-int32 map_mapname2ipport(unsigned short name, uint32* ip, uint16* port);
-int32 map_setipport(unsigned short map, uint32 ip, uint16 port);
-int32 map_eraseipport(unsigned short map, uint32 ip, uint16 port);
+int32 map_mapname2ipport(uint16 name, uint32* ip, uint16* port);
+int32 map_setipport(uint16 map, uint32 ip, uint16 port);
+int32 map_eraseipport(uint16 map, uint32 ip, uint16 port);
 int32 map_eraseallipport(void);
 void map_addiddb(struct block_list *);
 void map_deliddb(struct block_list *bl);
@@ -1229,7 +1229,7 @@ bool map_iwall_set(int16 m, int16 x, int16 y, int32 size, int8 dir, bool shootab
 void map_iwall_get(map_session_data *sd);
 bool map_iwall_remove(const char *wall_name);
 
-int32 map_addmobtolist(unsigned short m, struct spawn_data *spawn);	// [Wizputer]
+int32 map_addmobtolist(uint16 m, struct spawn_data *spawn);	// [Wizputer]
 void map_spawnmobs(int16 m); // [Wizputer]
 void map_removemobs(int16 m); // [Wizputer]
 void map_addmap2db(struct map_data *m);

src/map/mob.cpp

@@ -2223,7 +2223,7 @@ void mob_setdropitem_option( item& item, s_mob_drop& mobdrop ){
 /*==========================================
  * Initializes the delay drop structure for mob-dropped items.
  *------------------------------------------*/
-static std::shared_ptr<s_item_drop> mob_setdropitem( s_mob_drop& mobdrop, int32 qty, unsigned short mob_id ){
+static std::shared_ptr<s_item_drop> mob_setdropitem( s_mob_drop& mobdrop, int32 qty, uint16 mob_id ){
 	std::shared_ptr<s_item_drop> drop = std::make_shared<s_item_drop>();
 
 	drop->item_data = { 0 };
@@ -2239,7 +2239,7 @@ static std::shared_ptr<s_item_drop> mob_setdropitem( s_mob_drop& mobdrop, int32
 /*==========================================
  * Initializes the delay drop structure for mob-looted items.
  *------------------------------------------*/
-static std::shared_ptr<s_item_drop> mob_setlootitem( s_mob_lootitem& item, unsigned short mob_id ){
+static std::shared_ptr<s_item_drop> mob_setlootitem( s_mob_lootitem& item, uint16 mob_id ){
 	std::shared_ptr<s_item_drop> drop = std::make_shared<s_item_drop>();
 
 	memcpy( &drop->item_data, &item, sizeof( struct item ) );
@@ -3444,7 +3444,7 @@ bool mob_has_spawn(uint16 mob_id)
 */
 void mob_add_spawn(uint16 mob_id, const struct spawn_info& new_spawn)
 {
-	unsigned short m = new_spawn.mapindex;
+	uint16 m = new_spawn.mapindex;
 
 	if( new_spawn.qty <= 0 )
 		return; //ignore empty spawns
@@ -4418,7 +4418,7 @@ int32 mob_clone_delete(struct mob_data *md){
 }
 
 //Adjusts the drop rate of item according to the criteria given. [Skotlex]
-static uint32 mob_drop_adjust(int32 baserate, int32 rate_adjust, unsigned short rate_min, unsigned short rate_max)
+static uint32 mob_drop_adjust(int32 baserate, int32 rate_adjust, uint16 rate_min, uint16 rate_max)
 {
 	double rate = baserate;
 
@@ -5478,7 +5478,7 @@ uint64 MobAvailDatabase::parseBodyNode(const ryml::NodeRef& node) {
 			constant = sprite_mob->id;
 		}
 
-		mob->vd.class_ = (unsigned short)constant;
+		mob->vd.class_ = (uint16)constant;
 	} else {
 		this->invalidWarning(node["Sprite"], "Sprite is missing.\n");
 		return 0;
@@ -6379,7 +6379,7 @@ static void mob_drop_ratio_adjust(void){
 		}
 
 		for( j = 0; j < MAX_MOB_DROP_TOTAL; j++ ){
-			unsigned short ratemin, ratemax;
+			uint16 ratemin, ratemax;
 			bool is_treasurechest;
 
 			nameid = mob->dropitem[j].nameid;
@@ -6463,7 +6463,7 @@ static void mob_drop_ratio_adjust(void){
 			// calculate and store Max available drop chance of the item
 			// but skip treasure chests.
 			if( rate && !is_treasurechest ){
-				unsigned short k;
+				uint16 k;
 
 				if( id->maxchance == -1 || ( id->maxchance < rate ) ){
 					id->maxchance = rate; // item has bigger drop chance or sold in shops

src/map/mob.hpp

@@ -201,7 +201,7 @@ struct s_mob_skill {
 	short target;
 	int32 val[5];
 	short emotion;
-	unsigned short msg_id;
+	uint16 msg_id;
 };
 
 struct s_mob_chat {
@@ -237,14 +237,14 @@ public:
 };
 
 struct spawn_info {
-	unsigned short mapindex;
-	unsigned short qty;
+	uint16 mapindex;
+	uint16 qty;
 };
 
 /// Loooitem struct
 struct s_mob_lootitem {
 	struct item item;	   ///< Item info
-	unsigned short mob_id; ///< ID of monster that dropped the item
+	uint16 mob_id; ///< ID of monster that dropped the item
 };
 
 /// Struct for monster's drop item
@@ -473,7 +473,7 @@ enum e_mob_skill_condition {
 // The data structures for storing delayed item drops
 struct s_item_drop{
 	struct item item_data;
-	unsigned short mob_id;
+	uint16 mob_id;
 	enum bl_type src_type;
 };
 

src/map/npc.cpp

@@ -102,7 +102,7 @@ static char *npc_last_path;
 
 struct npc_path_data {
 	char* path;
-	unsigned short references;
+	uint16 references;
 };
 struct npc_path_data *npc_last_npd;
 static DBMap *npc_path_db;
@@ -2216,7 +2216,7 @@ int32 npc_click(map_session_data* sd, struct npc_data* nd)
 		case NPCTYPE_MARKETSHOP:
 #if PACKETVER >= 20131223
 			 {
-				unsigned short i;
+				uint16 i;
 
 				for (i = 0; i < nd->u.shop.count; i++) {
 					if (nd->u.shop.shop_item[i].qty)
@@ -2553,7 +2553,7 @@ int32 npc_cashshop_buylist( map_session_data *sd, int32 points, std::vector<s_np
 
 		if( !pet_create_egg(sd,nameid) ) {
 			struct item item_tmp;
-			unsigned short get_amt = amount;
+			uint16 get_amt = amount;
 
 			memset(&item_tmp, 0, sizeof(item_tmp));
 			item_tmp.nameid = nameid;
@@ -2707,7 +2707,7 @@ int32 npc_cashshop_buy(map_session_data *sd, t_itemid nameid, int32 amount, int3
 		return res;
 
 	if( !pet_create_egg(sd, nameid) ) {
-		unsigned short get_amt = amount;
+		uint16 get_amt = amount;
 
 		struct item item_tmp = {};
 
@@ -2787,7 +2787,7 @@ e_purchase_result npc_buylist( map_session_data* sd, std::vector<s_npc_buy_list>
 	// process entries in buy list, one by one
 	for( int32 i = 0; i < item_list.size(); ++i ){
 		t_itemid nameid;
-		unsigned short amount;
+		uint16 amount;
 		int32 value;
 
 		// find this entry in the shop's sell list
@@ -2862,7 +2862,7 @@ e_purchase_result npc_buylist( map_session_data* sd, std::vector<s_npc_buy_list>
 
 	for( int32 i = 0; i < item_list.size(); ++i ) {
 		t_itemid nameid = item_list[i].nameid;
-		unsigned short amount = item_list[i].qty;
+		uint16 amount = item_list[i].qty;
 
 #if PACKETVER >= 20131223
 		if (nd->subtype == NPCTYPE_MARKETSHOP) {
@@ -2880,7 +2880,7 @@ e_purchase_result npc_buylist( map_session_data* sd, std::vector<s_npc_buy_list>
 		if (itemdb_type(nameid) == IT_PETEGG)
 			pet_create_egg(sd, nameid);
 		else {
-			unsigned short get_amt = amount;
+			uint16 get_amt = amount;
 
 			if ((itemdb_search(nameid))->flag.guid)
 				get_amt = 1;
@@ -3798,7 +3798,7 @@ struct npc_data *npc_create_npc(int16 m, int16 x, int16 y){
  * @param to_y : y coordinate to warp to
  * @return nullptr:failed creation, npc_data* new warp
  */
-struct npc_data* npc_add_warp(char* name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y)
+struct npc_data* npc_add_warp(char* name, short from_mapid, short from_x, short from_y, short xs, short ys, uint16 to_mapindex, short to_x, short to_y)
 {
 	int32 i, flag = 0;
 	struct npc_data *nd;
@@ -3870,7 +3870,7 @@ static const char* npc_parse_warp(char* w1, char* w2, char* w3, char* w4, const
 	}
 
 	int32 m = map_mapname2mapid(mapname);
-	unsigned short i = mapindex_name2id(to_mapname);
+	uint16 i = mapindex_name2id(to_mapname);
 
 	if( i == 0 ) {
 		ShowError("npc_parse_warp: Unknown destination map in file '%s', line '%d' : %s\n * w1=%s\n * w2=%s\n * w3=%s\n * w4=%s\n", filepath, strline(buffer,start-buffer), to_mapname, w1, w2, w3, w4);
@@ -5216,7 +5216,7 @@ static const char* npc_parse_mob(char* w1, char* w2, char* w3, char* w4, const c
 	m =  map_mapname2mapid(mapname);
 	if( m < 0 )//Not loaded on this map-server instance.
 		return strchr(start,'\n');// skip and continue
-	mob.m = (unsigned short)m;
+	mob.m = (uint16)m;
 
 	struct map_data *mapdata = map_getmapdata(m);
 
@@ -5275,11 +5275,11 @@ static const char* npc_parse_mob(char* w1, char* w2, char* w3, char* w4, const c
 		return strchr(start, '\n');
 	}
 
-	mob.num = (unsigned short)num;
+	mob.num = (uint16)num;
 	mob.active = 0;
 	mob.id = (short) mob_id;
-	mob.x = (unsigned short)x;
-	mob.y = (unsigned short)y;
+	mob.x = (uint16)x;
+	mob.y = (uint16)y;
 	mob.xs = (signed short)xs;
 	mob.ys = (signed short)ys;
 	if (mob_lv > 0 && mob_lv <= MAX_LEVEL)

src/map/npc.hpp

@@ -173,7 +173,7 @@ struct npc_data {
 	struct status_data status;
 	uint32 level,stat_point;
 	struct s_npc_params {
-		unsigned short str, agi, vit, int_, dex, luk;
+		uint16 str, agi, vit, int_, dex, luk;
 	} params;
 
 	void* chatdb; // pointer to a npc_parse struct (see npc_chat.cpp)
@@ -203,7 +203,7 @@ struct npc_data {
 		struct {
 			short xs,ys; // OnTouch area radius
 			short x,y; // destination coords
-			unsigned short mapindex; // destination map
+			uint16 mapindex; // destination map
 		} warp;
 		struct {
 			struct mob_data *md;
@@ -1591,7 +1591,7 @@ static int32 npc_buylist_sub(map_session_data* sd, std::vector<s_npc_buy_list>&
 uint8 npc_selllist(map_session_data* sd, int32 list_length, const PACKET_CZ_PC_SELL_ITEMLIST_sub* item_list);
 e_purchase_result npc_barter_purchase( map_session_data& sd, std::shared_ptr<s_npc_barter> barter, std::vector<s_barter_purchase>& purchases );
 void npc_parse_mob2(struct spawn_data* mob);
-struct npc_data* npc_add_warp(char* name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y);
+struct npc_data* npc_add_warp(char* name, short from_mapid, short from_x, short from_y, short xs, short ys, uint16 to_mapindex, short to_x, short to_y);
 int32 npc_globalmessage(const char* name,const char* mes);
 const char *npc_get_script_event_name(int32 npce_index);
 npc_data* npc_duplicate_npc( npc_data& nd, char name[NPC_NAME_LENGTH + 1], int16 mapid, int16 x, int16 y, int32 class_, uint8 dir, int16 xs, int16 ys, map_session_data* owner = nullptr );

src/map/party.hpp

@@ -19,7 +19,7 @@ struct item;
 struct party_member_data {
 	map_session_data *sd;
 	uint32 hp; //For HP,x,y refreshing.
-	unsigned short x, y;
+	uint16 x, y;
 };
 
 struct party_data {

src/map/pc.cpp

@@ -2337,7 +2337,7 @@ void pc_reg_received(map_session_data *sd)
 	}
 
 	if ((i = pc_checkskill(sd,RG_PLAGIARISM)) > 0) {
-		unsigned short skid = static_cast<unsigned short>(pc_readglobalreg(sd, add_str(SKILL_VAR_PLAGIARISM)));
+		uint16 skid = static_cast<uint16>(pc_readglobalreg(sd, add_str(SKILL_VAR_PLAGIARISM)));
 		sd->cloneskill_idx = skill_get_index(skid);
 		if (sd->cloneskill_idx > 0) {
 			sd->status.skill[sd->cloneskill_idx].id = skid;
@@ -2348,7 +2348,7 @@ void pc_reg_received(map_session_data *sd)
 		}
 	}
 	if ((i = pc_checkskill(sd,SC_REPRODUCE)) > 0) {
-		unsigned short skid = static_cast<unsigned short>(pc_readglobalreg(sd, add_str(SKILL_VAR_REPRODUCE)));
+		uint16 skid = static_cast<uint16>(pc_readglobalreg(sd, add_str(SKILL_VAR_REPRODUCE)));
 		sd->reproduceskill_idx = skill_get_index(skid);
 		if (sd->reproduceskill_idx > 0) {
 			sd->status.skill[sd->reproduceskill_idx].id = skid;
@@ -6799,7 +6799,7 @@ int32 pc_steal_coin(map_session_data *sd,struct block_list *target)
  *			SETPOS_NO_MAPSERVER	Map not in this map-server, and failed to locate alternate map-server.
  *			SETPOS_AUTOTRADE	Player is in autotrade state
  *------------------------------------------*/
-enum e_setpos pc_setpos(map_session_data* sd, unsigned short mapindex, int32 x, int32 y, clr_type clrtype)
+enum e_setpos pc_setpos(map_session_data* sd, uint16 mapindex, int32 x, int32 y, clr_type clrtype)
 {
 	nullpo_retr(SETPOS_OK,sd);
 
@@ -7375,7 +7375,7 @@ bool pc_checkequip2(map_session_data *sd, t_itemid nameid, int32 min, int32 max)
  * Convert's from the client's lame Job ID system
  * to the map server's 'makes sense' system. [Skotlex]
  *------------------------------------------*/
-uint64 pc_jobid2mapid(unsigned short b_class)
+uint64 pc_jobid2mapid(uint16 b_class)
 {
 	switch(b_class)
 	{
@@ -10724,7 +10724,7 @@ bool pc_jobchange(map_session_data *sd,int32 job, char upper)
 	if (job == -1)
 		return false;
 
-	if ((unsigned short)b_class == sd->class_)
+	if ((uint16)b_class == sd->class_)
 		return false; //Nothing to change.
 
 	// If the job does not exist in the job db, dont allow changing to it
@@ -10772,7 +10772,7 @@ bool pc_jobchange(map_session_data *sd,int32 job, char upper)
 	sd->status.class_ = job;
 	fame_flag = pc_famerank(sd->status.char_id,sd->class_&MAPID_UPPERMASK);
 	uint64 previous_class = sd->class_;
-	sd->class_ = (unsigned short)b_class;
+	sd->class_ = (uint16)b_class;
 	sd->status.job_level=1;
 	sd->status.job_exp=0;
 
@@ -14426,7 +14426,7 @@ void pc_itemcd_do(map_session_data *sd, bool load) {
  * @return 0: No delay, can consume item.
  *         1: Has delay, cancel consumption.
  **/
-uint8 pc_itemcd_add(map_session_data *sd, struct item_data *id, t_tick tick, unsigned short n) {
+uint8 pc_itemcd_add(map_session_data *sd, struct item_data *id, t_tick tick, uint16 n) {
 	int32 i;
 	ARR_FIND(0, MAX_ITEMDELAYS, i, sd->item_delay[i].nameid == id->nameid );
 	if( i == MAX_ITEMDELAYS ) /* item not found. try first empty now */
@@ -14472,7 +14472,7 @@ uint8 pc_itemcd_add(map_session_data *sd, struct item_data *id, t_tick tick, uns
  * @return 0: No delay, can consume item.
  *         1: Has delay, cancel consumption.
  **/
-uint8 pc_itemcd_check(map_session_data *sd, struct item_data *id, t_tick tick, unsigned short n) {
+uint8 pc_itemcd_check(map_session_data *sd, struct item_data *id, t_tick tick, uint16 n) {
 	status_change *sc = nullptr;
 
 	nullpo_retr(0, sd);

src/map/pc.hpp

@@ -320,10 +320,10 @@ struct s_addeffectonskill {
 ///Struct of add drop item/group rate
 struct s_add_drop {
 	t_itemid nameid; ///Item ID
-	unsigned short group; ///Group ID
+	uint16 group; ///Group ID
 	int32 rate; ///Rate, 1 ~ 10000, -1 ~ -100000
 	short race; ///Target Race, bitwise value of 1<<x. if < 0 means Monster ID
-	unsigned short class_; ///Target Class, bitwise value of 1<<x
+	uint16 class_; ///Target Class, bitwise value of 1<<x
 };
 
 struct s_vanish_bonus {
@@ -422,9 +422,9 @@ public:
 		uint32 changemap : 1;
 		uint32 callshop : 1; // flag to indicate that a script used callshop; on a shop
 		short pmap; // Previous map on Map Change
-		unsigned short autoloot;
+		uint16 autoloot;
 		t_itemid autolootid[AUTOLOOTITEM_SIZE]; // [Zephyrus]
-		unsigned short autoloottype;
+		uint16 autoloottype;
 		uint32 autolooting : 1; //performance-saver, autolooting state for @alootid
 		uint32 gmaster_flag : 1;
 		uint32 prevend : 1;//used to flag wheather you've spent 40sp to open the vending or not.
@@ -493,7 +493,7 @@ public:
 	uint32 weight,max_weight,add_max_weight;
 	int32 cart_weight,cart_num,cart_weight_max;
 	int32 fd;
-	unsigned short mapindex;
+	uint16 mapindex;
 	unsigned char head_dir; //0: Look forward. 1: Look right, 2: Look left.
 	t_tick client_tick;
 	int32 npc_id,npc_shopid; //for script follow scriptoid;   ,npcid
@@ -664,9 +664,9 @@ public:
 		short add_steal_rate;
 		int32 add_heal_rate, add_heal2_rate;
 		int32 sp_gain_value, hp_gain_value, magic_sp_gain_value, magic_hp_gain_value, long_sp_gain_value, long_hp_gain_value;
-		unsigned short unbreakable;	// chance to prevent ANY equipment breaking [celest]
-		unsigned short unbreakable_equip; //100% break resistance on certain equipment
-		unsigned short unstripable_equip;
+		uint16 unbreakable;	// chance to prevent ANY equipment breaking [celest]
+		uint16 unbreakable_equip; //100% break resistance on certain equipment
+		uint16 unstripable_equip;
 		int32 fixcastrate, varcastrate, delayrate; // n/100
 		int32 add_fixcast, add_varcast; // in milliseconds
 		int32 ematk; // matk bonus from equipment
@@ -751,18 +751,18 @@ public:
 
 	struct s_hate_mob {
 		int32  m; //-1 - none, other: map index corresponding to map name.
-		unsigned short index; //map index
+		uint16 index; //map index
 	} feel_map[3];// 0 - Sun; 1 - Moon; 2 - Stars
 	short hate_mob[3];
 
 	int32 pvp_timer;
 	short pvp_point;
-	unsigned short pvp_rank, pvp_lastusers;
-	unsigned short pvp_won, pvp_lost;
+	uint16 pvp_rank, pvp_lastusers;
+	uint16 pvp_won, pvp_lost;
 
 	char eventqueue[MAX_EVENTQUEUE][EVENT_NAME_LENGTH];
 	int32 eventtimer[MAX_EVENTTIMER];
-	unsigned short eventcount; // [celest]
+	uint16 eventcount; // [celest]
 
 	uint16 change_level_2nd; // job level when changing from 1st to 2nd class [jobchange_level in global_reg_value]
 	uint16 change_level_3rd; // job level when changing from 2nd to 3rd class [jobchange_level_3rd in global_reg_value]
@@ -1421,7 +1421,7 @@ enum e_setpos{
 	SETPOS_AUTOTRADE = 3
 };
 
-enum e_setpos pc_setpos(map_session_data* sd, unsigned short mapindex, int32 x, int32 y, clr_type clrtype);
+enum e_setpos pc_setpos(map_session_data* sd, uint16 mapindex, int32 x, int32 y, clr_type clrtype);
 enum e_setpos pc_setpos_savepoint( map_session_data& sd, clr_type clrtype = CLR_TELEPORT );
 void pc_setsavepoint(map_session_data *sd, short mapindex,int32 x,int32 y);
 char pc_randomwarp(map_session_data *sd,clr_type type,bool ignore_mapflag = false);
@@ -1601,7 +1601,7 @@ void pc_regen (map_session_data *sd, t_tick diff_tick);
 bool pc_setstand(map_session_data *sd, bool force);
 bool pc_candrop(map_session_data *sd,struct item *item);
 
-uint64 pc_jobid2mapid(unsigned short b_class);	// Skotlex
+uint64 pc_jobid2mapid(uint16 b_class);	// Skotlex
 int32 pc_mapid2jobid(uint64 class_, int32 sex);	// Skotlex
 
 const char * job_name(int32 class_);
@@ -1689,8 +1689,8 @@ bool pc_isautolooting(map_session_data *sd, t_itemid nameid);
 void pc_overheat(map_session_data &sd, int16 heat);
 
 void pc_itemcd_do(map_session_data *sd, bool load);
-uint8 pc_itemcd_add(map_session_data *sd, struct item_data *id, t_tick tick, unsigned short n);
-uint8 pc_itemcd_check(map_session_data *sd, struct item_data *id, t_tick tick, unsigned short n);
+uint8 pc_itemcd_add(map_session_data *sd, struct item_data *id, t_tick tick, uint16 n);
+uint8 pc_itemcd_check(map_session_data *sd, struct item_data *id, t_tick tick, uint16 n);
 
 int32 pc_load_combo(map_session_data *sd);
 

src/map/pet.hpp

@@ -93,41 +93,41 @@ enum e_pet_hungry : uint16 {
 
 struct pet_recovery { //Stat recovery
 	enum sc_type type;	//Status Change id
-	unsigned short delay; //How long before curing (secs).
+	uint16 delay; //How long before curing (secs).
 	int32 timer;
 };
 
 struct pet_bonus {
-	unsigned short type; //bStr, bVit?
-	unsigned short val;	//value
-	unsigned short duration; //in seconds
-	unsigned short delay;	//Time before re-effect the bonus in seconds
+	uint16 type; //bStr, bVit?
+	uint16 val;	//value
+	uint16 duration; //in seconds
+	uint16 delay;	//Time before re-effect the bonus in seconds
 	int32 timer;
 };
 
 struct pet_skill_attack { //Attack Skill
-	unsigned short id;
-	unsigned short lv; // Skill level
-	unsigned short damage; // Fixed damage value of petskillattack2
-	unsigned short div_; //0 = Normal skill. >0 = Fixed damage (lv), fixed div_.
-	unsigned short rate; //Base chance of skill ocurrance (10 = 10% of attacks)
-	unsigned short bonusrate; //How being 100% loyal affects cast rate (10 = At 1000 intimacy->rate+10%
+	uint16 id;
+	uint16 lv; // Skill level
+	uint16 damage; // Fixed damage value of petskillattack2
+	uint16 div_; //0 = Normal skill. >0 = Fixed damage (lv), fixed div_.
+	uint16 rate; //Base chance of skill ocurrance (10 = 10% of attacks)
+	uint16 bonusrate; //How being 100% loyal affects cast rate (10 = At 1000 intimacy->rate+10%
 };
 
 struct pet_skill_support { //Support Skill
-	unsigned short id;
-	unsigned short lv;
-	unsigned short hp; //Max HP% for skill to trigger (50 -> 50% for Magnificat)
-	unsigned short sp; //Max SP% for skill to trigger (100 = no check)
-	unsigned short delay; //Time (secs) between being able to recast.
+	uint16 id;
+	uint16 lv;
+	uint16 hp; //Max HP% for skill to trigger (50 -> 50% for Magnificat)
+	uint16 sp; //Max SP% for skill to trigger (100 = no check)
+	uint16 delay; //Time (secs) between being able to recast.
 	int32 timer;
 };
 
 struct pet_loot {
 	struct item *item;
-	unsigned short count;
-	unsigned short weight;
-	unsigned short max;
+	uint16 count;
+	uint16 weight;
+	uint16 max;
 };
 
 class PetDatabase : public TypesafeYamlDatabase<uint16,s_pet_db>{
@@ -195,7 +195,7 @@ struct pet_data {
 	} state;
 	int32 move_fail_count;
 	t_tick next_walktime,last_thinktime;
-	unsigned short rate_fix;	//Support rate as modified by intimacy (1000 = 100%) [Skotlex]
+	uint16 rate_fix;	//Support rate as modified by intimacy (1000 = 100%) [Skotlex]
 
 	struct pet_recovery* recovery;
 	struct pet_bonus* bonus;

src/map/script.cpp

@@ -7435,7 +7435,7 @@ BUILDIN_FUNC(rentalcountitem)
 BUILDIN_FUNC(checkweight)
 {
 	int32 slots = 0;
-	unsigned short amount2 = 0;
+	uint16 amount2 = 0;
 	uint32 weight = 0, i, nbargs;
 	std::shared_ptr<item_data> id;
 	map_session_data* sd;
@@ -7453,7 +7453,7 @@ BUILDIN_FUNC(checkweight)
 
 	for (i = 2; i < nbargs; i += 2) {
 		t_itemid nameid;
-		unsigned short amount;
+		uint16 amount;
 
 		if( script_isstring(st, i) ) // item name
 			id = item_db.searchname( script_getstr( st, i ) );
@@ -7516,7 +7516,7 @@ BUILDIN_FUNC(checkweight2)
 	//variable sub checkweight
 	int32 i = 0, slots = 0, weight = 0;
 	short fail = 0;
-	unsigned short amount2 = 0;
+	uint16 amount2 = 0;
 
 	//variable for array parsing
 	struct script_data* data_it;
@@ -7626,7 +7626,7 @@ BUILDIN_FUNC(getitem)
 {
 	int32 get_count, i;
 	t_itemid nameid;
-	unsigned short amount;
+	uint16 amount;
 	map_session_data* sd;
 	const char* command = script_getfuncname(st);
 	std::shared_ptr<item_data> id;
@@ -8410,7 +8410,7 @@ static bool buildin_delitem_search(map_session_data* sd, struct item* it, uint8
 
 	for(;;)
 	{
-		unsigned short important = 0;
+		uint16 important = 0;
 		amount = it->amount;
 
 		// 1st pass -- less important items / exact match
@@ -10701,7 +10701,7 @@ BUILDIN_FUNC(setmadogear)
 BUILDIN_FUNC(savepoint)
 {
 	int32 x, y, m, cid_pos = 5;
-	unsigned short map_idx;
+	uint16 map_idx;
 	const char* str;
 	TBL_PC* sd;
 
@@ -12019,7 +12019,7 @@ BUILDIN_FUNC(getmapguildusers)
 	auto g = guild_search(gid);
 
 	if (g){
-		unsigned short i;
+		uint16 i;
 		for(i = 0; i < g->guild.max_member; i++)
 		{
 			if (g->guild.member[i].sd && g->guild.member[i].sd->bl.m == m)
@@ -12174,7 +12174,7 @@ BUILDIN_FUNC(getunits)
 static int32 buildin_getareadropitem_sub(struct block_list *bl,va_list ap)
 {
 	t_itemid nameid = va_arg(ap, t_itemid);
-	unsigned short *amount = (unsigned short *)va_arg(ap, int32 *);
+	uint16 *amount = (uint16 *)va_arg(ap, int32 *);
 	struct flooritem_data *drop=(struct flooritem_data *)bl;
 
 	if(drop->item.nameid==nameid)
@@ -12187,7 +12187,7 @@ BUILDIN_FUNC(getareadropitem)
 	const char *str;
 	int16 m,x0,y0,x1,y1;
 	t_itemid nameid;
-	unsigned short amount = 0;
+	uint16 amount = 0;
 
 	str=script_getstr(st,2);
 	x0=script_getnum(st,3);
@@ -13447,7 +13447,7 @@ BUILDIN_FUNC(isloggedin)
 BUILDIN_FUNC(setmapflagnosave)
 {
 	int16 m,x,y;
-	unsigned short mapindex;
+	uint16 mapindex;
 	const char *str,*str2;
 	union u_mapflag_args args = {};
 
@@ -14421,7 +14421,7 @@ BUILDIN_FUNC(getfatherid)
 BUILDIN_FUNC(warppartner)
 {
 	int32 x,y;
-	unsigned short mapindex;
+	uint16 mapindex;
 	const char *str;
 	TBL_PC *sd;
 	TBL_PC *p_sd;
@@ -15300,7 +15300,7 @@ BUILDIN_FUNC(petskillattack)
 
 	pd->a_skill->id = id;
 	pd->a_skill->damage = 0;
-	pd->a_skill->lv = (unsigned short)min(script_getnum(st,3), skill_get_max(pd->a_skill->id));
+	pd->a_skill->lv = (uint16)min(script_getnum(st,3), skill_get_max(pd->a_skill->id));
 	pd->a_skill->div_ = 0;
 	pd->a_skill->rate = script_getnum(st,4);
 	pd->a_skill->bonusrate = script_getnum(st,5);
@@ -15333,7 +15333,7 @@ BUILDIN_FUNC(petskillattack2)
 
 	pd->a_skill->id = id;
 	pd->a_skill->damage = script_getnum(st,3); // Fixed damage
-	pd->a_skill->lv = (unsigned short)skill_get_max(pd->a_skill->id); // Adjust to max skill level
+	pd->a_skill->lv = (uint16)skill_get_max(pd->a_skill->id); // Adjust to max skill level
 	pd->a_skill->div_ = script_getnum(st,4);
 	pd->a_skill->rate = script_getnum(st,5);
 	pd->a_skill->bonusrate = script_getnum(st,6);
@@ -18062,7 +18062,7 @@ BUILDIN_FUNC(callshop)
 	}
 #if PACKETVER >= 20131223
 	else if (nd->subtype == NPCTYPE_MARKETSHOP) {
-		unsigned short i;
+		uint16 i;
 
 		for (i = 0; i < nd->u.shop.count; i++) {
 			if (nd->u.shop.shop_item[i].qty)
@@ -18255,7 +18255,7 @@ BUILDIN_FUNC(npcshopdelitem)
 	const char* npcname = script_getstr(st,2);
 	struct npc_data* nd = npc_name2id(npcname);
 	int32 n, i, size;
-	unsigned short amount;
+	uint16 amount;
 
 	if (!nd || ( nd->subtype != NPCTYPE_SHOP && nd->subtype != NPCTYPE_CASHSHOP && nd->subtype != NPCTYPE_ITEMSHOP && nd->subtype != NPCTYPE_POINTSHOP && nd->subtype != NPCTYPE_MARKETSHOP)) { // Not found.
 		script_pushint(st,0);
@@ -19281,14 +19281,14 @@ BUILDIN_FUNC(setunitdata)
 
 		switch (type) {
 			case UMOB_SIZE: md->status.size = md->base_status->size = (unsigned char)value; break;
-			case UMOB_LEVEL: md->level = (unsigned short)value; clif_name_area(&md->bl); break;
+			case UMOB_LEVEL: md->level = (uint16)value; clif_name_area(&md->bl); break;
 			case UMOB_HP: md->base_status->hp = (uint32)value; status_set_hp(bl, (uint32)value, 0); clif_name_area(&md->bl); break;
 			case UMOB_MAXHP: md->base_status->hp = md->base_status->max_hp = (uint32)value; status_set_maxhp(bl, (uint32)value, 0); clif_name_area(&md->bl); break;
 			case UMOB_MASTERAID: md->master_id = value; break;
 			case UMOB_MAPID: if (mapname) value = map_mapname2mapid(mapname); unit_warp(bl, (short)value, 0, 0, CLR_TELEPORT); break;
 			case UMOB_X: if (!unit_walktoxy(bl, (short)value, md->bl.y, 2)) unit_movepos(bl, (short)value, md->bl.y, 0, 0); break;
 			case UMOB_Y: if (!unit_walktoxy(bl, md->bl.x, (short)value, 2)) unit_movepos(bl, md->bl.x, (short)value, 0, 0); break;
-			case UMOB_SPEED: md->base_status->speed = (unsigned short)value; status_calc_misc(bl, &md->status, md->level); calc_status = true; break;
+			case UMOB_SPEED: md->base_status->speed = (uint16)value; status_calc_misc(bl, &md->status, md->level); calc_status = true; break;
 			case UMOB_MODE:
 				md->base_status->mode = (enum e_mode)value;
 				// Mob mode must be updated before calling unit_refresh
@@ -19296,25 +19296,25 @@ BUILDIN_FUNC(setunitdata)
 				unit_refresh(bl);
 				break;
 			case UMOB_AI: md->special_state.ai = (enum mob_ai)value; break;
-			case UMOB_SCOPTION: md->sc.option = (unsigned short)value; break;
+			case UMOB_SCOPTION: md->sc.option = (uint16)value; break;
 			case UMOB_SEX: md->vd->sex = (char)value; unit_refresh(bl); break;
-			case UMOB_CLASS: status_set_viewdata(bl, (unsigned short)value); unit_refresh(bl); break;
-			case UMOB_HAIRSTYLE: clif_changelook(bl, LOOK_HAIR, (unsigned short)value); break;
-			case UMOB_HAIRCOLOR: clif_changelook(bl, LOOK_HAIR_COLOR, (unsigned short)value); break;
-			case UMOB_HEADBOTTOM: clif_changelook(bl, LOOK_HEAD_BOTTOM, (unsigned short)value); break;
-			case UMOB_HEADMIDDLE: clif_changelook(bl, LOOK_HEAD_MID, (unsigned short)value); break;
-			case UMOB_HEADTOP: clif_changelook(bl, LOOK_HEAD_TOP, (unsigned short)value); break;
-			case UMOB_CLOTHCOLOR: clif_changelook(bl, LOOK_CLOTHES_COLOR, (unsigned short)value); break;
-			case UMOB_SHIELD: clif_changelook(bl, LOOK_SHIELD, (unsigned short)value); break;
-			case UMOB_WEAPON: clif_changelook(bl, LOOK_WEAPON, (unsigned short)value); break;
+			case UMOB_CLASS: status_set_viewdata(bl, (uint16)value); unit_refresh(bl); break;
+			case UMOB_HAIRSTYLE: clif_changelook(bl, LOOK_HAIR, (uint16)value); break;
+			case UMOB_HAIRCOLOR: clif_changelook(bl, LOOK_HAIR_COLOR, (uint16)value); break;
+			case UMOB_HEADBOTTOM: clif_changelook(bl, LOOK_HEAD_BOTTOM, (uint16)value); break;
+			case UMOB_HEADMIDDLE: clif_changelook(bl, LOOK_HEAD_MID, (uint16)value); break;
+			case UMOB_HEADTOP: clif_changelook(bl, LOOK_HEAD_TOP, (uint16)value); break;
+			case UMOB_CLOTHCOLOR: clif_changelook(bl, LOOK_CLOTHES_COLOR, (uint16)value); break;
+			case UMOB_SHIELD: clif_changelook(bl, LOOK_SHIELD, (uint16)value); break;
+			case UMOB_WEAPON: clif_changelook(bl, LOOK_WEAPON, (uint16)value); break;
 			case UMOB_LOOKDIR: unit_setdir(bl, (uint8)value); break;
 			case UMOB_CANMOVETICK: md->ud.canmove_tick = value > 0 ? (uint32)value : 0; break;
-			case UMOB_STR: md->base_status->str = (unsigned short)value; status_calc_misc(bl, &md->status, md->level); calc_status = true; break;
-			case UMOB_AGI: md->base_status->agi = (unsigned short)value; status_calc_misc(bl, &md->status, md->level); calc_status = true; break;
-			case UMOB_VIT: md->base_status->vit = (unsigned short)value; status_calc_misc(bl, &md->status, md->level); calc_status = true; break;
-			case UMOB_INT: md->base_status->int_ = (unsigned short)value; status_calc_misc(bl, &md->status, md->level); calc_status = true; break;
-			case UMOB_DEX: md->base_status->dex = (unsigned short)value; status_calc_misc(bl, &md->status, md->level); calc_status = true; break;
-			case UMOB_LUK: md->base_status->luk = (unsigned short)value; status_calc_misc(bl, &md->status, md->level); calc_status = true; break;
+			case UMOB_STR: md->base_status->str = (uint16)value; status_calc_misc(bl, &md->status, md->level); calc_status = true; break;
+			case UMOB_AGI: md->base_status->agi = (uint16)value; status_calc_misc(bl, &md->status, md->level); calc_status = true; break;
+			case UMOB_VIT: md->base_status->vit = (uint16)value; status_calc_misc(bl, &md->status, md->level); calc_status = true; break;
+			case UMOB_INT: md->base_status->int_ = (uint16)value; status_calc_misc(bl, &md->status, md->level); calc_status = true; break;
+			case UMOB_DEX: md->base_status->dex = (uint16)value; status_calc_misc(bl, &md->status, md->level); calc_status = true; break;
+			case UMOB_LUK: md->base_status->luk = (uint16)value; status_calc_misc(bl, &md->status, md->level); calc_status = true; break;
 			case UMOB_SLAVECPYMSTRMD:
 				if (value > 0) {
 					TBL_MOB *md2 = nullptr;
@@ -19329,11 +19329,11 @@ BUILDIN_FUNC(setunitdata)
 				calc_status = true;
 				break;
 			case UMOB_DMGIMMUNE: md->ud.immune_attack = value > 0; break;
-			case UMOB_ATKRANGE: md->base_status->rhw.range = (unsigned short)value; calc_status = true; break;
-			case UMOB_ATKMIN: md->base_status->rhw.atk = (unsigned short)value; calc_status = true; break;
-			case UMOB_ATKMAX: md->base_status->rhw.atk2 = (unsigned short)value; calc_status = true; break;
-			case UMOB_MATKMIN: md->base_status->matk_min = (unsigned short)value; calc_status = true; break;
-			case UMOB_MATKMAX: md->base_status->matk_max = (unsigned short)value; calc_status = true; break;
+			case UMOB_ATKRANGE: md->base_status->rhw.range = (uint16)value; calc_status = true; break;
+			case UMOB_ATKMIN: md->base_status->rhw.atk = (uint16)value; calc_status = true; break;
+			case UMOB_ATKMAX: md->base_status->rhw.atk2 = (uint16)value; calc_status = true; break;
+			case UMOB_MATKMIN: md->base_status->matk_min = (uint16)value; calc_status = true; break;
+			case UMOB_MATKMAX: md->base_status->matk_max = (uint16)value; calc_status = true; break;
 			case UMOB_DEF: md->base_status->def = (defType)value; calc_status = true; break;
 			case UMOB_MDEF: md->base_status->mdef = (defType)value; calc_status = true; break;
 			case UMOB_HIT: md->base_status->hit = (short)value; calc_status = true; break;
@@ -19359,13 +19359,13 @@ BUILDIN_FUNC(setunitdata)
 				mob_target(md,target,0);
 				break;
 			}
-			case UMOB_ROBE: clif_changelook(bl, LOOK_ROBE, (unsigned short)value); break;
-			case UMOB_BODY2: clif_changelook(bl, LOOK_BODY2, (unsigned short)value); break;
+			case UMOB_ROBE: clif_changelook(bl, LOOK_ROBE, (uint16)value); break;
+			case UMOB_BODY2: clif_changelook(bl, LOOK_BODY2, (uint16)value); break;
 			case UMOB_GROUP_ID: md->ud.group_id = value; unit_refresh(bl); break;
 			case UMOB_IGNORE_CELL_STACK_LIMIT: md->ud.state.ignore_cell_stack_limit = value > 0; break;
 			case UMOB_RES: md->base_status->res = (short)value; calc_status = true; break;
 			case UMOB_MRES: md->base_status->mres = (short)value; calc_status = true; break;
-			case UMOB_DAMAGETAKEN: md->damagetaken = (unsigned short)value; break;
+			case UMOB_DAMAGETAKEN: md->damagetaken = (uint16)value; break;
 			default:
 				ShowError("buildin_setunitdata: Unknown data identifier %d for BL_MOB.\n", type);
 				return SCRIPT_CMD_FAILURE;
@@ -19379,7 +19379,7 @@ BUILDIN_FUNC(setunitdata)
 
 		switch (type) {
 			case UHOM_SIZE: hd->battle_status.size = hd->base_status.size = (unsigned char)value; break;
-			case UHOM_LEVEL: hd->homunculus.level = (unsigned short)value; break;
+			case UHOM_LEVEL: hd->homunculus.level = (uint16)value; break;
 			case UHOM_HP: hd->base_status.hp = (uint32)value; status_set_hp(bl, (uint32)value, 0); break;
 			case UHOM_MAXHP: hd->base_status.hp = hd->base_status.max_hp = (uint32)value; status_set_maxhp(bl, (uint32)value, 0); break;
 			case UHOM_SP: hd->base_status.sp = (uint32)value; status_set_sp(bl, (uint32)value, 0); break;
@@ -19390,21 +19390,21 @@ BUILDIN_FUNC(setunitdata)
 			case UHOM_Y: if (!unit_walktoxy(bl, hd->bl.x, (short)value, 2)) unit_movepos(bl, hd->bl.x, (short)value, 0, 0); break;
 			case UHOM_HUNGER: hd->homunculus.hunger = (short)value; clif_send_homdata(*hd, SP_HUNGRY); break;
 			case UHOM_INTIMACY: hom_increase_intimacy(hd, (uint32)value); clif_send_homdata(*hd, SP_INTIMATE); break;
-			case UHOM_SPEED: hd->base_status.speed = (unsigned short)value; status_calc_misc(bl, &hd->base_status, hd->homunculus.level); calc_status = true; break;
+			case UHOM_SPEED: hd->base_status.speed = (uint16)value; status_calc_misc(bl, &hd->base_status, hd->homunculus.level); calc_status = true; break;
 			case UHOM_LOOKDIR: unit_setdir(bl, (uint8)value); break;
 			case UHOM_CANMOVETICK: hd->ud.canmove_tick = value > 0 ? (uint32)value : 0; break;
-			case UHOM_STR: hd->base_status.str = (unsigned short)value; status_calc_misc(bl, &hd->base_status, hd->homunculus.level); calc_status = true; break;
-			case UHOM_AGI: hd->base_status.agi = (unsigned short)value; status_calc_misc(bl, &hd->base_status, hd->homunculus.level); calc_status = true; break;
-			case UHOM_VIT: hd->base_status.vit = (unsigned short)value; status_calc_misc(bl, &hd->base_status, hd->homunculus.level); calc_status = true; break;
-			case UHOM_INT: hd->base_status.int_ = (unsigned short)value; status_calc_misc(bl, &hd->base_status, hd->homunculus.level); calc_status = true; break;
-			case UHOM_DEX: hd->base_status.dex = (unsigned short)value; status_calc_misc(bl, &hd->base_status, hd->homunculus.level); calc_status = true; break;
-			case UHOM_LUK: hd->base_status.luk = (unsigned short)value; status_calc_misc(bl, &hd->base_status, hd->homunculus.level); calc_status = true; break;
+			case UHOM_STR: hd->base_status.str = (uint16)value; status_calc_misc(bl, &hd->base_status, hd->homunculus.level); calc_status = true; break;
+			case UHOM_AGI: hd->base_status.agi = (uint16)value; status_calc_misc(bl, &hd->base_status, hd->homunculus.level); calc_status = true; break;
+			case UHOM_VIT: hd->base_status.vit = (uint16)value; status_calc_misc(bl, &hd->base_status, hd->homunculus.level); calc_status = true; break;
+			case UHOM_INT: hd->base_status.int_ = (uint16)value; status_calc_misc(bl, &hd->base_status, hd->homunculus.level); calc_status = true; break;
+			case UHOM_DEX: hd->base_status.dex = (uint16)value; status_calc_misc(bl, &hd->base_status, hd->homunculus.level); calc_status = true; break;
+			case UHOM_LUK: hd->base_status.luk = (uint16)value; status_calc_misc(bl, &hd->base_status, hd->homunculus.level); calc_status = true; break;
 			case UHOM_DMGIMMUNE: hd->ud.immune_attack = value > 0; break;
-			case UHOM_ATKRANGE: hd->base_status.rhw.range = (unsigned short)value; calc_status = true; break;
-			case UHOM_ATKMIN: hd->base_status.rhw.atk = (unsigned short)value; calc_status = true; break;
-			case UHOM_ATKMAX: hd->base_status.rhw.atk2 = (unsigned short)value; calc_status = true; break;
-			case UHOM_MATKMIN: hd->base_status.matk_min = (unsigned short)value; calc_status = true; break;
-			case UHOM_MATKMAX: hd->base_status.matk_max = (unsigned short)value; calc_status = true; break;
+			case UHOM_ATKRANGE: hd->base_status.rhw.range = (uint16)value; calc_status = true; break;
+			case UHOM_ATKMIN: hd->base_status.rhw.atk = (uint16)value; calc_status = true; break;
+			case UHOM_ATKMAX: hd->base_status.rhw.atk2 = (uint16)value; calc_status = true; break;
+			case UHOM_MATKMIN: hd->base_status.matk_min = (uint16)value; calc_status = true; break;
+			case UHOM_MATKMAX: hd->base_status.matk_max = (uint16)value; calc_status = true; break;
 			case UHOM_DEF: hd->base_status.def = (defType)value; calc_status = true; break;
 			case UHOM_MDEF: hd->base_status.mdef = (defType)value; calc_status = true; break;
 			case UHOM_HIT: hd->base_status.hit = (short)value; calc_status = true; break;
@@ -19447,7 +19447,7 @@ BUILDIN_FUNC(setunitdata)
 
 		switch (type) {
 			case UPET_SIZE: pd->status.size = (unsigned char)value; break;
-			case UPET_LEVEL: pd->pet.level = (unsigned short)value; break;
+			case UPET_LEVEL: pd->pet.level = (uint16)value; break;
 			case UPET_HP: pd->status.hp = pd->status.max_hp = (uint32)value; status_set_hp(bl, (uint32)value, 0); break;
 			case UPET_MAXHP: pd->status.hp = pd->status.max_hp = (uint32)value; status_set_maxhp(bl, (uint32)value, 0); break;
 			case UPET_MASTERAID: pd->pet.account_id = (uint32)value; break;
@@ -19456,21 +19456,21 @@ BUILDIN_FUNC(setunitdata)
 			case UPET_Y: if (!unit_walktoxy(bl, pd->bl.x, (short)value, 2)) unit_movepos(bl, pd->bl.x, (short)value, 0, 0); break;
 			case UPET_HUNGER: pd->pet.hungry = cap_value((short)value, 0, 100); clif_send_petdata(map_id2sd(pd->pet.account_id), pd, 2, pd->pet.hungry); break;
 			case UPET_INTIMACY: pet_set_intimate(pd, (uint32)value); clif_send_petdata(map_id2sd(pd->pet.account_id), pd, 1, pd->pet.intimate); break;
-			case UPET_SPEED: pd->status.speed = (unsigned short)value; status_calc_misc(bl, &pd->status, pd->pet.level); break;
+			case UPET_SPEED: pd->status.speed = (uint16)value; status_calc_misc(bl, &pd->status, pd->pet.level); break;
 			case UPET_LOOKDIR: unit_setdir(bl, (uint8)value); break;
 			case UPET_CANMOVETICK: pd->ud.canmove_tick = value > 0 ? (uint32)value : 0; break;
-			case UPET_STR: pd->status.str = (unsigned short)value; status_calc_misc(bl, &pd->status, pd->pet.level); break;
-			case UPET_AGI: pd->status.agi = (unsigned short)value; status_calc_misc(bl, &pd->status, pd->pet.level); break;
-			case UPET_VIT: pd->status.vit = (unsigned short)value; status_calc_misc(bl, &pd->status, pd->pet.level); break;
-			case UPET_INT: pd->status.int_ = (unsigned short)value; status_calc_misc(bl, &pd->status, pd->pet.level); break;
-			case UPET_DEX: pd->status.dex = (unsigned short)value; status_calc_misc(bl, &pd->status, pd->pet.level); break;
-			case UPET_LUK: pd->status.luk = (unsigned short)value; status_calc_misc(bl, &pd->status, pd->pet.level); break;
+			case UPET_STR: pd->status.str = (uint16)value; status_calc_misc(bl, &pd->status, pd->pet.level); break;
+			case UPET_AGI: pd->status.agi = (uint16)value; status_calc_misc(bl, &pd->status, pd->pet.level); break;
+			case UPET_VIT: pd->status.vit = (uint16)value; status_calc_misc(bl, &pd->status, pd->pet.level); break;
+			case UPET_INT: pd->status.int_ = (uint16)value; status_calc_misc(bl, &pd->status, pd->pet.level); break;
+			case UPET_DEX: pd->status.dex = (uint16)value; status_calc_misc(bl, &pd->status, pd->pet.level); break;
+			case UPET_LUK: pd->status.luk = (uint16)value; status_calc_misc(bl, &pd->status, pd->pet.level); break;
 			case UPET_DMGIMMUNE: pd->ud.immune_attack = value > 0; break;
-			case UPET_ATKRANGE: pd->status.rhw.range = (unsigned short)value; break;
-			case UPET_ATKMIN: pd->status.rhw.atk = (unsigned short)value; break;
-			case UPET_ATKMAX: pd->status.rhw.atk2 = (unsigned short)value; break;
-			case UPET_MATKMIN: pd->status.matk_min = (unsigned short)value; break;
-			case UPET_MATKMAX: pd->status.matk_max = (unsigned short)value; break;
+			case UPET_ATKRANGE: pd->status.rhw.range = (uint16)value; break;
+			case UPET_ATKMIN: pd->status.rhw.atk = (uint16)value; break;
+			case UPET_ATKMAX: pd->status.rhw.atk2 = (uint16)value; break;
+			case UPET_MATKMIN: pd->status.matk_min = (uint16)value; break;
+			case UPET_MATKMAX: pd->status.matk_max = (uint16)value; break;
 			case UPET_DEF: pd->status.def = (defType)value; break;
 			case UPET_MDEF: pd->status.mdef = (defType)value; break;
 			case UPET_HIT: pd->status.hit = (short)value; break;
@@ -19506,21 +19506,21 @@ BUILDIN_FUNC(setunitdata)
 			case UMER_Y: if (!unit_walktoxy(bl, mc->bl.x, (short)value, 2)) unit_movepos(bl, mc->bl.x, (short)value, 0, 0); break;
 			case UMER_KILLCOUNT: mc->mercenary.kill_count = (uint32)value; break;
 			case UMER_LIFETIME: mc->mercenary.life_time = (uint32)value; break;
-			case UMER_SPEED: mc->base_status.speed = (unsigned short)value; status_calc_misc(bl, &mc->base_status, mc->db->lv); calc_status = true; break;
+			case UMER_SPEED: mc->base_status.speed = (uint16)value; status_calc_misc(bl, &mc->base_status, mc->db->lv); calc_status = true; break;
 			case UMER_LOOKDIR: unit_setdir(bl, (uint8)value); break;
 			case UMER_CANMOVETICK: mc->ud.canmove_tick = value > 0 ? (uint32)value : 0; break;
-			case UMER_STR: mc->base_status.str = (unsigned short)value; status_calc_misc(bl, &mc->base_status, mc->db->lv); calc_status = true; break;
-			case UMER_AGI: mc->base_status.agi = (unsigned short)value; status_calc_misc(bl, &mc->base_status, mc->db->lv); calc_status = true; break;
-			case UMER_VIT: mc->base_status.vit = (unsigned short)value; status_calc_misc(bl, &mc->base_status, mc->db->lv); calc_status = true; break;
-			case UMER_INT: mc->base_status.int_ = (unsigned short)value; status_calc_misc(bl, &mc->base_status, mc->db->lv); calc_status = true; break;
-			case UMER_DEX: mc->base_status.dex = (unsigned short)value; status_calc_misc(bl, &mc->base_status, mc->db->lv); calc_status = true; break;
-			case UMER_LUK: mc->base_status.luk = (unsigned short)value; status_calc_misc(bl, &mc->base_status, mc->db->lv); calc_status = true; break;
+			case UMER_STR: mc->base_status.str = (uint16)value; status_calc_misc(bl, &mc->base_status, mc->db->lv); calc_status = true; break;
+			case UMER_AGI: mc->base_status.agi = (uint16)value; status_calc_misc(bl, &mc->base_status, mc->db->lv); calc_status = true; break;
+			case UMER_VIT: mc->base_status.vit = (uint16)value; status_calc_misc(bl, &mc->base_status, mc->db->lv); calc_status = true; break;
+			case UMER_INT: mc->base_status.int_ = (uint16)value; status_calc_misc(bl, &mc->base_status, mc->db->lv); calc_status = true; break;
+			case UMER_DEX: mc->base_status.dex = (uint16)value; status_calc_misc(bl, &mc->base_status, mc->db->lv); calc_status = true; break;
+			case UMER_LUK: mc->base_status.luk = (uint16)value; status_calc_misc(bl, &mc->base_status, mc->db->lv); calc_status = true; break;
 			case UMER_DMGIMMUNE: mc->ud.immune_attack = value > 0; break;
-			case UMER_ATKRANGE: mc->base_status.rhw.range = (unsigned short)value; calc_status = true; break;
-			case UMER_ATKMIN: mc->base_status.rhw.atk = (unsigned short)value; calc_status = true; break;
-			case UMER_ATKMAX: mc->base_status.rhw.atk2 = (unsigned short)value; calc_status = true; break;
-			case UMER_MATKMIN: mc->base_status.matk_min = (unsigned short)value; calc_status = true; break;
-			case UMER_MATKMAX: mc->base_status.matk_max = (unsigned short)value; calc_status = true; break;
+			case UMER_ATKRANGE: mc->base_status.rhw.range = (uint16)value; calc_status = true; break;
+			case UMER_ATKMIN: mc->base_status.rhw.atk = (uint16)value; calc_status = true; break;
+			case UMER_ATKMAX: mc->base_status.rhw.atk2 = (uint16)value; calc_status = true; break;
+			case UMER_MATKMIN: mc->base_status.matk_min = (uint16)value; calc_status = true; break;
+			case UMER_MATKMAX: mc->base_status.matk_max = (uint16)value; calc_status = true; break;
 			case UMER_DEF: mc->base_status.def = (defType)value; calc_status = true; break;
 			case UMER_MDEF: mc->base_status.mdef = (defType)value; calc_status = true; break;
 			case UMER_HIT: mc->base_status.hit = (short)value; calc_status = true; break;
@@ -19576,21 +19576,21 @@ BUILDIN_FUNC(setunitdata)
 			case UELE_Y: if (!unit_walktoxy(bl, ed->bl.x, (short)value, 2)) unit_movepos(bl, ed->bl.x, (short)value, 0, 0); break;
 			case UELE_LIFETIME: ed->elemental.life_time = (uint32)value; break;
 			case UELE_MODE: ed->elemental.mode = (enum e_mode)value; calc_status = true; break;
-			case UELE_SPEED: ed->base_status.speed = (unsigned short)value; status_calc_misc(bl, &ed->base_status, ed->db->lv); calc_status = true; break;
+			case UELE_SPEED: ed->base_status.speed = (uint16)value; status_calc_misc(bl, &ed->base_status, ed->db->lv); calc_status = true; break;
 			case UELE_LOOKDIR: unit_setdir(bl, (uint8)value); break;
 			case UELE_CANMOVETICK: ed->ud.canmove_tick = value > 0 ? (uint32)value : 0; break;
-			case UELE_STR: ed->base_status.str = (unsigned short)value; status_calc_misc(bl, &ed->base_status, ed->db->lv); calc_status = true; break;
-			case UELE_AGI: ed->base_status.agi = (unsigned short)value; status_calc_misc(bl, &ed->base_status, ed->db->lv); calc_status = true; break;
-			case UELE_VIT: ed->base_status.vit = (unsigned short)value; status_calc_misc(bl, &ed->base_status, ed->db->lv); calc_status = true; break;
-			case UELE_INT: ed->base_status.int_ = (unsigned short)value; status_calc_misc(bl, &ed->base_status, ed->db->lv); calc_status = true; break;
-			case UELE_DEX: ed->base_status.dex = (unsigned short)value; status_calc_misc(bl, &ed->base_status, ed->db->lv); calc_status = true; break;
-			case UELE_LUK: ed->base_status.luk = (unsigned short)value; status_calc_misc(bl, &ed->base_status, ed->db->lv); calc_status = true; break;
+			case UELE_STR: ed->base_status.str = (uint16)value; status_calc_misc(bl, &ed->base_status, ed->db->lv); calc_status = true; break;
+			case UELE_AGI: ed->base_status.agi = (uint16)value; status_calc_misc(bl, &ed->base_status, ed->db->lv); calc_status = true; break;
+			case UELE_VIT: ed->base_status.vit = (uint16)value; status_calc_misc(bl, &ed->base_status, ed->db->lv); calc_status = true; break;
+			case UELE_INT: ed->base_status.int_ = (uint16)value; status_calc_misc(bl, &ed->base_status, ed->db->lv); calc_status = true; break;
+			case UELE_DEX: ed->base_status.dex = (uint16)value; status_calc_misc(bl, &ed->base_status, ed->db->lv); calc_status = true; break;
+			case UELE_LUK: ed->base_status.luk = (uint16)value; status_calc_misc(bl, &ed->base_status, ed->db->lv); calc_status = true; break;
 			case UELE_DMGIMMUNE: ed->ud.immune_attack = value > 0; break;
-			case UELE_ATKRANGE: ed->base_status.rhw.range = (unsigned short)value; calc_status = true; break;
-			case UELE_ATKMIN: ed->base_status.rhw.atk = (unsigned short)value; calc_status = true; break;
-			case UELE_ATKMAX: ed->base_status.rhw.atk2 = (unsigned short)value; calc_status = true; break;
-			case UELE_MATKMIN: ed->base_status.matk_min = (unsigned short)value; calc_status = true; break;
-			case UELE_MATKMAX: ed->base_status.matk_max = (unsigned short)value; calc_status = true; break;
+			case UELE_ATKRANGE: ed->base_status.rhw.range = (uint16)value; calc_status = true; break;
+			case UELE_ATKMIN: ed->base_status.rhw.atk = (uint16)value; calc_status = true; break;
+			case UELE_ATKMAX: ed->base_status.rhw.atk2 = (uint16)value; calc_status = true; break;
+			case UELE_MATKMIN: ed->base_status.matk_min = (uint16)value; calc_status = true; break;
+			case UELE_MATKMAX: ed->base_status.matk_max = (uint16)value; calc_status = true; break;
 			case UELE_DEF: ed->base_status.def = (defType)value; calc_status = true; break;
 			case UELE_MDEF: ed->base_status.mdef = (defType)value; calc_status = true; break;
 			case UELE_HIT: ed->base_status.hit = (short)value; calc_status = true; break;
@@ -19646,18 +19646,18 @@ BUILDIN_FUNC(setunitdata)
 			case UNPC_X: if (!unit_walktoxy(bl, (short)value, nd->bl.y, 2)) unit_movepos(bl, (short)value, nd->bl.x, 0, 0); break;
 			case UNPC_Y: if (!unit_walktoxy(bl, nd->bl.x, (short)value, 2)) unit_movepos(bl, nd->bl.x, (short)value, 0, 0); break;
 			case UNPC_LOOKDIR: unit_setdir(bl, (uint8)value); break;
-			case UNPC_STR: nd->params.str = (unsigned short)value; status_calc_misc(bl, &nd->status, nd->level); break;
-			case UNPC_AGI: nd->params.agi = (unsigned short)value; status_calc_misc(bl, &nd->status, nd->level); break;
-			case UNPC_VIT: nd->params.vit = (unsigned short)value; status_calc_misc(bl, &nd->status, nd->level); break;
-			case UNPC_INT: nd->params.int_ = (unsigned short)value; status_calc_misc(bl, &nd->status, nd->level); break;
-			case UNPC_DEX: nd->params.dex = (unsigned short)value; status_calc_misc(bl, &nd->status, nd->level); break;
-			case UNPC_LUK: nd->params.luk = (unsigned short)value; status_calc_misc(bl, &nd->status, nd->level); break;
+			case UNPC_STR: nd->params.str = (uint16)value; status_calc_misc(bl, &nd->status, nd->level); break;
+			case UNPC_AGI: nd->params.agi = (uint16)value; status_calc_misc(bl, &nd->status, nd->level); break;
+			case UNPC_VIT: nd->params.vit = (uint16)value; status_calc_misc(bl, &nd->status, nd->level); break;
+			case UNPC_INT: nd->params.int_ = (uint16)value; status_calc_misc(bl, &nd->status, nd->level); break;
+			case UNPC_DEX: nd->params.dex = (uint16)value; status_calc_misc(bl, &nd->status, nd->level); break;
+			case UNPC_LUK: nd->params.luk = (uint16)value; status_calc_misc(bl, &nd->status, nd->level); break;
 			case UNPC_PLUSALLSTAT: nd->stat_point = (uint32)value; break;
-			case UNPC_ATKRANGE: nd->status.rhw.range = (unsigned short)value; break;
-			case UNPC_ATKMIN: nd->status.rhw.atk = (unsigned short)value; break;
-			case UNPC_ATKMAX: nd->status.rhw.atk2 = (unsigned short)value; break;
-			case UNPC_MATKMIN: nd->status.matk_min = (unsigned short)value; break;
-			case UNPC_MATKMAX: nd->status.matk_max = (unsigned short)value; break;
+			case UNPC_ATKRANGE: nd->status.rhw.range = (uint16)value; break;
+			case UNPC_ATKMIN: nd->status.rhw.atk = (uint16)value; break;
+			case UNPC_ATKMAX: nd->status.rhw.atk2 = (uint16)value; break;
+			case UNPC_MATKMIN: nd->status.matk_min = (uint16)value; break;
+			case UNPC_MATKMAX: nd->status.matk_max = (uint16)value; break;
 			case UNPC_DEF: nd->status.def = (defType)value; break;
 			case UNPC_MDEF: nd->status.mdef = (defType)value; break;
 			case UNPC_HIT: nd->status.hit = (short)value; break;
@@ -19672,16 +19672,16 @@ BUILDIN_FUNC(setunitdata)
 			case UNPC_DMOTION: nd->status.dmotion = (short)value; break;
 			case UNPC_SEX: nd->vd.sex = (char)value; unit_refresh(bl); break;
 			case UNPC_CLASS: npc_setclass(nd, (short)value); break;
-			case UNPC_HAIRSTYLE: clif_changelook(bl, LOOK_HAIR, (unsigned short)value); break;
-			case UNPC_HAIRCOLOR: clif_changelook(bl, LOOK_HAIR_COLOR, (unsigned short)value); break;
-			case UNPC_HEADBOTTOM: clif_changelook(bl, LOOK_HEAD_BOTTOM, (unsigned short)value); break;
-			case UNPC_HEADMIDDLE: clif_changelook(bl, LOOK_HEAD_MID, (unsigned short)value); break;
-			case UNPC_HEADTOP: clif_changelook(bl, LOOK_HEAD_TOP, (unsigned short)value); break;
-			case UNPC_CLOTHCOLOR: clif_changelook(bl, LOOK_CLOTHES_COLOR, (unsigned short)value); break;
-			case UNPC_SHIELD: clif_changelook(bl, LOOK_SHIELD, (unsigned short)value); break;
-			case UNPC_WEAPON: clif_changelook(bl, LOOK_WEAPON, (unsigned short)value); break;
-			case UNPC_ROBE: clif_changelook(bl, LOOK_ROBE, (unsigned short)value); break;
-			case UNPC_BODY2: clif_changelook(bl, LOOK_BODY2, (unsigned short)value); break;
+			case UNPC_HAIRSTYLE: clif_changelook(bl, LOOK_HAIR, (uint16)value); break;
+			case UNPC_HAIRCOLOR: clif_changelook(bl, LOOK_HAIR_COLOR, (uint16)value); break;
+			case UNPC_HEADBOTTOM: clif_changelook(bl, LOOK_HEAD_BOTTOM, (uint16)value); break;
+			case UNPC_HEADMIDDLE: clif_changelook(bl, LOOK_HEAD_MID, (uint16)value); break;
+			case UNPC_HEADTOP: clif_changelook(bl, LOOK_HEAD_TOP, (uint16)value); break;
+			case UNPC_CLOTHCOLOR: clif_changelook(bl, LOOK_CLOTHES_COLOR, (uint16)value); break;
+			case UNPC_SHIELD: clif_changelook(bl, LOOK_SHIELD, (uint16)value); break;
+			case UNPC_WEAPON: clif_changelook(bl, LOOK_WEAPON, (uint16)value); break;
+			case UNPC_ROBE: clif_changelook(bl, LOOK_ROBE, (uint16)value); break;
+			case UNPC_BODY2: clif_changelook(bl, LOOK_BODY2, (uint16)value); break;
 			case UNPC_DEADSIT: nd->vd.dead_sit = (char)value; unit_refresh(bl); break;
 			case UNPC_GROUP_ID: nd->ud.group_id = value; unit_refresh(bl); break;
 			default:
@@ -20371,7 +20371,7 @@ BUILDIN_FUNC(warpportal)
 {
 	int32 spx;
 	int32 spy;
-	unsigned short mapindex;
+	uint16 mapindex;
 	int32 tpx;
 	int32 tpy;
 	std::shared_ptr<s_skill_unit_group> group;
@@ -23125,7 +23125,7 @@ BUILDIN_FUNC(cleanmap)
 BUILDIN_FUNC(npcskill)
 {
 	uint16 skill_id;
-	unsigned short skill_level;
+	uint16 skill_level;
 	uint32 stat_point;
 	uint32 npc_level;
 	struct npc_data *nd;
@@ -25204,7 +25204,7 @@ BUILDIN_FUNC(channel_setgroup) {
 				script_pushint(st,1);
 				return SCRIPT_CMD_SUCCESS;
 			}
-			RECREATE(ch->groups, unsigned short, ++ch->group_count);
+			RECREATE(ch->groups, uint16, ++ch->group_count);
 			ch->groups[ch->group_count-1] = group;
 			ShowInfo("buildin_channel_setgroup: (2) Added group %d. Num: %d\n", ch->groups[ch->group_count-1], ch->group_count);
 		}
@@ -25229,7 +25229,7 @@ BUILDIN_FUNC(channel_setgroup) {
 			return SCRIPT_CMD_SUCCESS;
 		}
 
-		CREATE(ch->groups, unsigned short, n);
+		CREATE(ch->groups, uint16, n);
 		for (i = 3; i < n+2; i++) {
 			ch->groups[ch->group_count++] = script_getnum(st,i);
 			ShowInfo("buildin_channel_setgroup: (1) Added group %d. Num: %d\n", ch->groups[ch->group_count-1], ch->group_count);

src/map/script.hpp

@@ -295,7 +295,7 @@ struct script_code {
 	int32 script_size;
 	unsigned char* script_buf;
 	struct reg_db local;
-	unsigned short instances;
+	uint16 instances;
 };
 
 struct script_stack {

src/map/searchstore.hpp

@@ -72,7 +72,7 @@ struct s_search_store_info_item {
 	uint32 account_id;
 	char store_name[MESSAGE_SIZE];
 	t_itemid nameid;
-	unsigned short amount;
+	uint16 amount;
 	uint32 price;
 	t_itemid card[MAX_SLOTS];
 	unsigned char refine;

src/map/skill.cpp

@@ -65,7 +65,7 @@ struct skill_usave {
 };
 
 struct s_skill_produce_db skill_produce_db[MAX_SKILL_PRODUCE_DB];
-static unsigned short skill_produce_count;
+static uint16 skill_produce_count;
 
 AbraDatabase abra_db;
 ReadingSpellbookDatabase reading_spellbook_db;
@@ -75,12 +75,12 @@ SkillArrowDatabase skill_arrow_db;
 #define MAX_SKILL_CHANGEMATERIAL_SET 3
 struct s_skill_changematerial_db {
 	t_itemid nameid;
-	unsigned short rate;
-	unsigned short qty[MAX_SKILL_CHANGEMATERIAL_SET];
-	unsigned short qty_rate[MAX_SKILL_CHANGEMATERIAL_SET];
+	uint16 rate;
+	uint16 qty[MAX_SKILL_CHANGEMATERIAL_SET];
+	uint16 qty_rate[MAX_SKILL_CHANGEMATERIAL_SET];
 };
 struct s_skill_changematerial_db skill_changematerial_db[MAX_SKILL_CHANGEMATERIAL_DB];
-static unsigned short skill_changematerial_count;
+static uint16 skill_changematerial_count;
 
 
 MagicMushroomDatabase magic_mushroom_db;
@@ -372,7 +372,7 @@ int32 skill_get_range2(struct block_list *bl, uint16 skill_id, uint16 skill_lv,
  * @param skill_id Dummy skill ID
  * @return Real skill id if found
  **/
-unsigned short skill_dummy2skill_id(unsigned short skill_id) {
+uint16 skill_dummy2skill_id(uint16 skill_id) {
 	switch (skill_id) {
 		case AB_DUPLELIGHT_MELEE:
 		case AB_DUPLELIGHT_MAGIC:
@@ -2784,7 +2784,7 @@ int32 skill_counter_additional_effect (struct block_list* src, struct block_list
  - flag is a BCT_ flag to indicate which type of adjustment should be used
    (BCT_ENEMY/BCT_PARTY/BCT_SELF) are the valid values.
 --------------------------------------------------------------------------*/
-int32 skill_break_equip(struct block_list *src, struct block_list *bl, unsigned short where, int32 rate, int32 flag)
+int32 skill_break_equip(struct block_list *src, struct block_list *bl, uint16 where, int32 rate, int32 flag)
 {
 	status_change *src_sc = status_get_sc(src);
 
@@ -5027,7 +5027,7 @@ static int32 skill_tarotcard(struct block_list* src, struct block_list *target,
 		clif_damage(*src, *target, tick, 0, 0, 1000, 0, DMG_NORMAL, 0, false);
 		if (!status_isdead(*target))
 		{
-			unsigned short where[] = { EQP_ARMOR, EQP_SHIELD, EQP_HELM };
+			uint16 where[] = { EQP_ARMOR, EQP_SHIELD, EQP_HELM };
 			skill_break_equip(src, target, where[rnd() % 3], 10000, BCT_ENEMY);
 		}
 		break;
@@ -15377,7 +15377,7 @@ int32 skill_castend_map (map_session_data *sd, uint16 skill_id, const char *mapn
 			int32 i, lv, wx, wy;
 			int32 maxcount=0;
 			int32 x,y;
-			unsigned short mapindex;
+			uint16 mapindex;
 
 			mapindex  = mapindex_name2id((char*)mapname);
 			if(!mapindex) { //Given map not found?
@@ -16293,7 +16293,7 @@ static int32 skill_unit_onplace(struct skill_unit *unit, struct block_list *bl,
 					int32 x = sg->val2>>16;
 					int32 y = sg->val2&0xffff;
 					int32 count = sg->val1>>16;
-					unsigned short m = sg->val3;
+					uint16 m = sg->val3;
 
 					if( --count <= 0 )
 						skill_delunitgroup(sg);
@@ -17904,7 +17904,7 @@ static int32 skill_check_condition_mob_master_sub(struct block_list *bl, va_list
  * @param skill_id Skill ID
  * @return True if skill is need ammo; False otherwise.
  */
-int32 skill_isammotype(map_session_data *sd, unsigned short skill_id)
+int32 skill_isammotype(map_session_data *sd, uint16 skill_id)
 {
 	std::shared_ptr<s_skill_db> skill = skill_db.find(skill_id);
 
@@ -22517,7 +22517,7 @@ short skill_can_produce_mix(map_session_data *sd, t_itemid nameid, int32 trigger
 			if (pc_search_inventory(sd,nameid_produce) < 0)
 				return 0;
 		} else {
-			unsigned short idx, amt;
+			uint16 idx, amt;
 
 			for (idx = 0, amt = 0; idx < MAX_INVENTORY; idx++)
 				if (sd->inventory.u.items_inventory[idx].nameid == nameid_produce)
@@ -23453,7 +23453,7 @@ void skill_select_menu( map_session_data& sd, uint16 skill_id ){
 	sc_start4(&sd.bl,&sd.bl,SC__AUTOSHADOWSPELL,100,id,lv,prob,(aslvl*5),skill_get_time(SC_AUTOSHADOWSPELL,aslvl));
 }
 
-int32 skill_elementalanalysis( map_session_data& sd, int32 n, uint16 skill_lv, unsigned short* item_list ){
+int32 skill_elementalanalysis( map_session_data& sd, int32 n, uint16 skill_lv, uint16* item_list ){
 	nullpo_ret(item_list);
 
 	if( n <= 0 )
@@ -23526,7 +23526,7 @@ int32 skill_elementalanalysis( map_session_data& sd, int32 n, uint16 skill_lv, u
 	return 0;
 }
 
-int32 skill_changematerial(map_session_data *sd, int32 n, unsigned short *item_list) {
+int32 skill_changematerial(map_session_data *sd, int32 n, uint16 *item_list) {
 	int32 i, j, k, c, p = 0, amount;
 	t_itemid nameid;
 
@@ -25647,8 +25647,8 @@ static bool skill_parse_row_nocastdb( char* split[], size_t columns, size_t curr
  * Structure: ProduceItemID,ItemLV,RequireSkill,Requireskill_lv,MaterialID1,MaterialAmount1,...
  */
 static bool skill_parse_row_producedb( char* split[], size_t columns, size_t current ){
-	unsigned short x, y;
-	unsigned short id = atoi(split[0]);
+	uint16 x, y;
+	uint16 id = atoi(split[0]);
 	t_itemid nameid = 0;
 	bool found = false;
 

src/map/skill.hpp

@@ -443,11 +443,11 @@ enum e_skill_blown	{
 /// Create Database item
 struct s_skill_produce_db {
 	t_itemid nameid; /// Product ID
-	unsigned short req_skill; /// Required Skill
+	uint16 req_skill; /// Required Skill
 	unsigned char req_skill_lv, /// Required Skill Level
 		itemlv; /// Item Level
 	t_itemid mat_id[MAX_PRODUCE_RESOURCE]; /// Materials needed
-	unsigned short mat_amount[MAX_PRODUCE_RESOURCE]; /// Amount of each materials
+	uint16 mat_amount[MAX_PRODUCE_RESOURCE]; /// Amount of each materials
 };
 extern struct s_skill_produce_db skill_produce_db[MAX_SKILL_PRODUCE_DB];
 
@@ -545,11 +545,11 @@ int32 skill_get_ammo_qty( uint16 skill_id, uint16 skill_lv );
 int32 skill_get_state(uint16 skill_id);
 size_t skill_get_status_count( uint16 skill_id );
 int32 skill_get_spiritball( uint16 skill_id, uint16 skill_lv );
-unsigned short skill_dummy2skill_id(unsigned short skill_id);
+uint16 skill_dummy2skill_id(uint16 skill_id);
 
 uint16 skill_name2id(const char* name);
 
-int32 skill_isammotype(map_session_data *sd, unsigned short skill_id);
+int32 skill_isammotype(map_session_data *sd, uint16 skill_id);
 TIMER_FUNC(skill_castend_id);
 TIMER_FUNC(skill_castend_pos);
 TIMER_FUNC( skill_keep_using );
@@ -562,8 +562,8 @@ int32 skill_addtimerskill(struct block_list *src,t_tick tick,int32 target,int32
 int32 skill_additional_effect( struct block_list* src, struct block_list *bl,uint16 skill_id,uint16 skill_lv,int32 attack_type,enum damage_lv dmg_lv,t_tick tick);
 int32 skill_counter_additional_effect( struct block_list* src, struct block_list *bl,uint16 skill_id,uint16 skill_lv,int32 attack_type,t_tick tick);
 short skill_blown(struct block_list* src, struct block_list* target, char count, int8 dir, enum e_skill_blown flag);
-int32 skill_break_equip(struct block_list *src,struct block_list *bl, unsigned short where, int32 rate, int32 flag);
-int32 skill_strip_equip(struct block_list *src,struct block_list *bl, unsigned short where, int32 rate, int32 lv, int32 time);
+int32 skill_break_equip(struct block_list *src,struct block_list *bl, uint16 where, int32 rate, int32 flag);
+int32 skill_strip_equip(struct block_list *src,struct block_list *bl, uint16 where, int32 rate, int32 lv, int32 time);
 // Skills unit
 std::shared_ptr<s_skill_unit_group> skill_id2group(int32 group_id);
 std::shared_ptr<s_skill_unit_group> skill_unitsetting(struct block_list* src, uint16 skill_id, uint16 skill_lv, int16 x, int16 y, int32 flag);
@@ -2834,8 +2834,8 @@ void skill_poisoningweapon( map_session_data& sd, t_itemid nameid );
  **/
 void skill_select_menu( map_session_data& sd, uint16 skill_id );
 
-int32 skill_elementalanalysis( map_session_data& sd, int32 n, uint16 skill_lv, unsigned short *item_list ); // Sorcerer Four Elemental Analisys.
-int32 skill_changematerial(map_session_data *sd, int32 n, unsigned short *item_list);	// Genetic Change Material.
+int32 skill_elementalanalysis( map_session_data& sd, int32 n, uint16 skill_lv, uint16 *item_list ); // Sorcerer Four Elemental Analisys.
+int32 skill_changematerial(map_session_data *sd, int32 n, uint16 *item_list);	// Genetic Change Material.
 int32 skill_get_elemental_type(uint16 skill_id, uint16 skill_lv);
 
 int32 skill_banding_count(map_session_data *sd);

src/map/status.cpp

@@ -58,20 +58,20 @@ short current_equip_opt_index; /// Contains random option index of an equipped i
 
 uint16 SCDisabled[SC_MAX]; ///< List of disabled SC on map zones. [Cydh]
 
-static unsigned short status_calc_str(struct block_list *,status_change *,int32);
-static unsigned short status_calc_agi(struct block_list *,status_change *,int32);
-static unsigned short status_calc_vit(struct block_list *,status_change *,int32);
-static unsigned short status_calc_int(struct block_list *,status_change *,int32);
-static unsigned short status_calc_dex(struct block_list *,status_change *,int32);
-static unsigned short status_calc_luk(struct block_list *,status_change *,int32);
-static unsigned short status_calc_pow(struct block_list *, status_change *, int32);
-static unsigned short status_calc_sta(struct block_list *, status_change *, int32);
-static unsigned short status_calc_wis(struct block_list *, status_change *, int32);
-static unsigned short status_calc_spl(struct block_list *, status_change *, int32);
-static unsigned short status_calc_con(struct block_list *, status_change *, int32);
-static unsigned short status_calc_crt(struct block_list *, status_change *, int32);
-static unsigned short status_calc_batk(struct block_list *,status_change *,int32);
-static unsigned short status_calc_watk(struct block_list *,status_change *,int32);
+static uint16 status_calc_str(struct block_list *,status_change *,int32);
+static uint16 status_calc_agi(struct block_list *,status_change *,int32);
+static uint16 status_calc_vit(struct block_list *,status_change *,int32);
+static uint16 status_calc_int(struct block_list *,status_change *,int32);
+static uint16 status_calc_dex(struct block_list *,status_change *,int32);
+static uint16 status_calc_luk(struct block_list *,status_change *,int32);
+static uint16 status_calc_pow(struct block_list *, status_change *, int32);
+static uint16 status_calc_sta(struct block_list *, status_change *, int32);
+static uint16 status_calc_wis(struct block_list *, status_change *, int32);
+static uint16 status_calc_spl(struct block_list *, status_change *, int32);
+static uint16 status_calc_con(struct block_list *, status_change *, int32);
+static uint16 status_calc_crt(struct block_list *, status_change *, int32);
+static uint16 status_calc_batk(struct block_list *,status_change *,int32);
+static uint16 status_calc_watk(struct block_list *,status_change *,int32);
 static signed short status_calc_hit(struct block_list *,status_change *,int32);
 static signed short status_calc_critical(struct block_list *,status_change *,int32);
 static signed short status_calc_flee(struct block_list *,status_change *,int32);
@@ -80,9 +80,9 @@ static defType status_calc_def(struct block_list *bl, status_change *sc, int32);
 static signed short status_calc_def2(struct block_list *,status_change *,int32);
 static defType status_calc_mdef(struct block_list *bl, status_change *sc, int32);
 static signed short status_calc_mdef2(struct block_list *,status_change *,int32);
-static unsigned short status_calc_speed(struct block_list *,status_change *,int32);
+static uint16 status_calc_speed(struct block_list *,status_change *,int32);
 static short status_calc_aspd_rate(struct block_list *,status_change *,int32);
-static unsigned short status_calc_dmotion(struct block_list *bl, status_change *sc, int32 dmotion);
+static uint16 status_calc_dmotion(struct block_list *bl, status_change *sc, int32 dmotion);
 #ifdef RENEWAL_ASPD
 static short status_calc_aspd(struct block_list *bl, status_change *sc, bool fixed);
 #endif
@@ -2370,7 +2370,7 @@ int32 status_base_amotion_pc(map_session_data* sd, struct status_data* status)
  * @param status: Object status
  * @return base attack
  */
-unsigned short status_base_atk(const struct block_list *bl, const struct status_data *status, int32 level)
+uint16 status_base_atk(const struct block_list *bl, const struct status_data *status, int32 level)
 {
 	int32 flag = 0, str, dex, dstr;
 
@@ -2458,14 +2458,14 @@ uint32 status_weapon_atk(weapon_atk &wa)
 #endif
 
 #ifndef RENEWAL
-unsigned short status_base_matk_min(const struct status_data* status) { return status->int_ + (status->int_ / 7) * (status->int_ / 7); }
-unsigned short status_base_matk_max(const struct status_data* status) { return status->int_ + (status->int_ / 5) * (status->int_ / 5); }
+uint16 status_base_matk_min(const struct status_data* status) { return status->int_ + (status->int_ / 7) * (status->int_ / 7); }
+uint16 status_base_matk_max(const struct status_data* status) { return status->int_ + (status->int_ / 5) * (status->int_ / 5); }
 #else
 /*
 * Calculates minimum attack variance 80% from db's ATK1 for non BL_PC
 * status->batk (base attack) will be added in battle_calc_base_damage
 */
-unsigned short status_base_atk_min(struct block_list *bl, const struct status_data* status, int32 level)
+uint16 status_base_atk_min(struct block_list *bl, const struct status_data* status, int32 level)
 {
 	switch (bl->type) {
 		case BL_PET:
@@ -2484,7 +2484,7 @@ unsigned short status_base_atk_min(struct block_list *bl, const struct status_da
 * Calculates maximum attack variance 120% from db's ATK1 for non BL_PC
 * status->batk (base attack) will be added in battle_calc_base_damage
 */
-unsigned short status_base_atk_max(struct block_list *bl, const struct status_data* status, int32 level)
+uint16 status_base_atk_max(struct block_list *bl, const struct status_data* status, int32 level)
 {
 	switch (bl->type) {
 		case BL_PET:
@@ -2502,7 +2502,7 @@ unsigned short status_base_atk_max(struct block_list *bl, const struct status_da
 /*
 * Calculates minimum magic attack
 */
-unsigned short status_base_matk_min(struct block_list *bl, const struct status_data* status, int32 level)
+uint16 status_base_matk_min(struct block_list *bl, const struct status_data* status, int32 level)
 {
 	switch (bl->type) {
 		case BL_PET:
@@ -2521,7 +2521,7 @@ unsigned short status_base_matk_min(struct block_list *bl, const struct status_d
 /*
 * Calculates maximum magic attack
 */
-unsigned short status_base_matk_max(struct block_list *bl, const struct status_data* status, int32 level)
+uint16 status_base_matk_max(struct block_list *bl, const struct status_data* status, int32 level)
 {
 	switch (bl->type) {
 		case BL_PET:
@@ -6432,14 +6432,14 @@ void status_calc_bl_(struct block_list* bl, std::bitset<SCB_MAX> flag, uint8 opt
  * @param str: Initial str
  * @return modified str with cap_value(str,0,USHRT_MAX)
  */
-static unsigned short status_calc_str(struct block_list *bl, status_change *sc, int32 str)
+static uint16 status_calc_str(struct block_list *bl, status_change *sc, int32 str)
 {
 	if(sc == nullptr || sc->empty())
 		return cap_value(str,0,USHRT_MAX);
 
 	if(sc->getSCE(SC_HARMONIZE)) {
 		str -= sc->getSCE(SC_HARMONIZE)->val2;
-		return (unsigned short)cap_value(str,0,USHRT_MAX);
+		return (uint16)cap_value(str,0,USHRT_MAX);
 	}
 	if(sc->getSCE(SC_INCALLSTATUS))
 		str += sc->getSCE(SC_INCALLSTATUS)->val1;
@@ -6497,7 +6497,7 @@ static unsigned short status_calc_str(struct block_list *bl, status_change *sc,
 		str -= sc->getSCE(SC_ALL_STAT_DOWN)->val2;
 
 	//TODO: Stat points should be able to be decreased below 0
-	return (unsigned short)cap_value(str,0,USHRT_MAX);
+	return (uint16)cap_value(str,0,USHRT_MAX);
 }
 
 /**
@@ -6507,14 +6507,14 @@ static unsigned short status_calc_str(struct block_list *bl, status_change *sc,
  * @param agi: Initial agi
  * @return modified agi with cap_value(agi,0,USHRT_MAX)
  */
-static unsigned short status_calc_agi(struct block_list *bl, status_change *sc, int32 agi)
+static uint16 status_calc_agi(struct block_list *bl, status_change *sc, int32 agi)
 {
 	if(sc == nullptr || sc->empty())
 		return cap_value(agi,0,USHRT_MAX);
 
 	if(sc->getSCE(SC_HARMONIZE)) {
 		agi -= sc->getSCE(SC_HARMONIZE)->val2;
-		return (unsigned short)cap_value(agi,0,USHRT_MAX);
+		return (uint16)cap_value(agi,0,USHRT_MAX);
 	}
 	if(sc->getSCE(SC_CONCENTRATE) && !sc->getSCE(SC_QUAGMIRE))
 		agi += (agi-sc->getSCE(SC_CONCENTRATE)->val3)*sc->getSCE(SC_CONCENTRATE)->val2/100;
@@ -6570,7 +6570,7 @@ static unsigned short status_calc_agi(struct block_list *bl, status_change *sc,
 		agi -= sc->getSCE(SC_ALL_STAT_DOWN)->val2;
 
 	//TODO: Stat points should be able to be decreased below 0
-	return (unsigned short)cap_value(agi,0,USHRT_MAX);
+	return (uint16)cap_value(agi,0,USHRT_MAX);
 }
 
 /**
@@ -6580,14 +6580,14 @@ static unsigned short status_calc_agi(struct block_list *bl, status_change *sc,
  * @param vit: Initial vit
  * @return modified vit with cap_value(vit,0,USHRT_MAX)
  */
-static unsigned short status_calc_vit(struct block_list *bl, status_change *sc, int32 vit)
+static uint16 status_calc_vit(struct block_list *bl, status_change *sc, int32 vit)
 {
 	if(sc == nullptr || sc->empty())
 		return cap_value(vit,0,USHRT_MAX);
 
 	if(sc->getSCE(SC_HARMONIZE)) {
 		vit -= sc->getSCE(SC_HARMONIZE)->val2;
-		return (unsigned short)cap_value(vit,0,USHRT_MAX);
+		return (uint16)cap_value(vit,0,USHRT_MAX);
 	}
 	if(sc->getSCE(SC_INCALLSTATUS))
 		vit += sc->getSCE(SC_INCALLSTATUS)->val1;
@@ -6631,7 +6631,7 @@ static unsigned short status_calc_vit(struct block_list *bl, status_change *sc,
 		vit -= sc->getSCE(SC_ALL_STAT_DOWN)->val2;
 
 	//TODO: Stat points should be able to be decreased below 0
-	return (unsigned short)cap_value(vit,0,USHRT_MAX);
+	return (uint16)cap_value(vit,0,USHRT_MAX);
 }
 
 /**
@@ -6641,14 +6641,14 @@ static unsigned short status_calc_vit(struct block_list *bl, status_change *sc,
  * @param int_: Initial int32
  * @return modified int32 with cap_value(int_,0,USHRT_MAX)
  */
-static unsigned short status_calc_int(struct block_list *bl, status_change *sc, int32 int_)
+static uint16 status_calc_int(struct block_list *bl, status_change *sc, int32 int_)
 {
 	if(sc == nullptr || sc->empty())
 		return cap_value(int_,0,USHRT_MAX);
 
 	if(sc->getSCE(SC_HARMONIZE)) {
 		int_ -= sc->getSCE(SC_HARMONIZE)->val2;
-		return (unsigned short)cap_value(int_,0,USHRT_MAX);
+		return (uint16)cap_value(int_,0,USHRT_MAX);
 	}
 	if(sc->getSCE(SC_INCALLSTATUS))
 		int_ += sc->getSCE(SC_INCALLSTATUS)->val1;
@@ -6709,7 +6709,7 @@ static unsigned short status_calc_int(struct block_list *bl, status_change *sc,
 		int_ -= sc->getSCE(SC_ALL_STAT_DOWN)->val2;
 
 	//TODO: Stat points should be able to be decreased below 0
-	return (unsigned short)cap_value(int_,0,USHRT_MAX);
+	return (uint16)cap_value(int_,0,USHRT_MAX);
 }
 
 /**
@@ -6719,14 +6719,14 @@ static unsigned short status_calc_int(struct block_list *bl, status_change *sc,
  * @param dex: Initial dex
  * @return modified dex with cap_value(dex,0,USHRT_MAX)
  */
-static unsigned short status_calc_dex(struct block_list *bl, status_change *sc, int32 dex)
+static uint16 status_calc_dex(struct block_list *bl, status_change *sc, int32 dex)
 {
 	if(sc == nullptr || sc->empty())
 		return cap_value(dex,0,USHRT_MAX);
 
 	if(sc->getSCE(SC_HARMONIZE)) {
 		dex -= sc->getSCE(SC_HARMONIZE)->val2;
-		return (unsigned short)cap_value(dex,0,USHRT_MAX);
+		return (uint16)cap_value(dex,0,USHRT_MAX);
 	}
 	if(sc->getSCE(SC_CONCENTRATE) && !sc->getSCE(SC_QUAGMIRE))
 		dex += (dex-sc->getSCE(SC_CONCENTRATE)->val4)*sc->getSCE(SC_CONCENTRATE)->val2/100;
@@ -6784,7 +6784,7 @@ static unsigned short status_calc_dex(struct block_list *bl, status_change *sc,
 		dex -= sc->getSCE(SC_ALL_STAT_DOWN)->val2;
 
 	//TODO: Stat points should be able to be decreased below 0
-	return (unsigned short)cap_value(dex,0,USHRT_MAX);
+	return (uint16)cap_value(dex,0,USHRT_MAX);
 }
 
 /**
@@ -6794,14 +6794,14 @@ static unsigned short status_calc_dex(struct block_list *bl, status_change *sc,
  * @param luk: Initial luk
  * @return modified luk with cap_value(luk,0,USHRT_MAX)
  */
-static unsigned short status_calc_luk(struct block_list *bl, status_change *sc, int32 luk)
+static uint16 status_calc_luk(struct block_list *bl, status_change *sc, int32 luk)
 {
 	if(sc == nullptr || sc->empty())
 		return cap_value(luk,0,USHRT_MAX);
 
 	if(sc->getSCE(SC_HARMONIZE)) {
 		luk -= sc->getSCE(SC_HARMONIZE)->val2;
-		return (unsigned short)cap_value(luk,0,USHRT_MAX);
+		return (uint16)cap_value(luk,0,USHRT_MAX);
 	}
 	if(sc->getSCE(SC_CURSE))
 		return 0;
@@ -6845,7 +6845,7 @@ static unsigned short status_calc_luk(struct block_list *bl, status_change *sc,
 		luk -= sc->getSCE(SC_ALL_STAT_DOWN)->val2;
 
 	//TODO: Stat points should be able to be decreased below 0
-	return (unsigned short)cap_value(luk,0,USHRT_MAX);
+	return (uint16)cap_value(luk,0,USHRT_MAX);
 }
 
 /**
@@ -6855,7 +6855,7 @@ static unsigned short status_calc_luk(struct block_list *bl, status_change *sc,
 * @param pow: Initial pow
 * @return modified pow with cap_value(pow,0,USHRT_MAX)
 */
-static unsigned short status_calc_pow(struct block_list *bl, status_change *sc, int32 pow)
+static uint16 status_calc_pow(struct block_list *bl, status_change *sc, int32 pow)
 {
 	if (sc == nullptr || sc->empty())
 		return cap_value(pow, 0, USHRT_MAX);
@@ -6865,7 +6865,7 @@ static unsigned short status_calc_pow(struct block_list *bl, status_change *sc,
 	if (sc->getSCE(SC_MARINE_FESTIVAL) != nullptr)
 		pow += sc->getSCE(SC_MARINE_FESTIVAL)->val2;
 
-	return (unsigned short)cap_value(pow, 0, USHRT_MAX);
+	return (uint16)cap_value(pow, 0, USHRT_MAX);
 }
 
 /**
@@ -6875,7 +6875,7 @@ static unsigned short status_calc_pow(struct block_list *bl, status_change *sc,
 * @param sta: Initial sta
 * @return modified sta with cap_value(sta,0,USHRT_MAX)
 */
-static unsigned short status_calc_sta(struct block_list *bl, status_change *sc, int32 sta)
+static uint16 status_calc_sta(struct block_list *bl, status_change *sc, int32 sta)
 {
 	if (sc == nullptr || sc->empty())
 		return cap_value(sta, 0, USHRT_MAX);
@@ -6885,7 +6885,7 @@ static unsigned short status_calc_sta(struct block_list *bl, status_change *sc,
 	if (sc->getSCE(SC_SANDY_FESTIVAL) != nullptr)
 		sta += sc->getSCE(SC_SANDY_FESTIVAL)->val2;
 
-	return (unsigned short)cap_value(sta, 0, USHRT_MAX);
+	return (uint16)cap_value(sta, 0, USHRT_MAX);
 }
 
 /**
@@ -6895,7 +6895,7 @@ static unsigned short status_calc_sta(struct block_list *bl, status_change *sc,
 * @param wis: Initial wis
 * @return modified wis with cap_value(wis,0,USHRT_MAX)
 */
-static unsigned short status_calc_wis(struct block_list *bl, status_change *sc, int32 wis)
+static uint16 status_calc_wis(struct block_list *bl, status_change *sc, int32 wis)
 {
 	if (sc == nullptr || sc->empty())
 		return cap_value(wis, 0, USHRT_MAX);
@@ -6905,7 +6905,7 @@ static unsigned short status_calc_wis(struct block_list *bl, status_change *sc,
 	if (sc->getSCE(SC_SANDY_FESTIVAL) != nullptr)
 		wis += sc->getSCE(SC_SANDY_FESTIVAL)->val2;
 
-	return (unsigned short)cap_value(wis, 0, USHRT_MAX);
+	return (uint16)cap_value(wis, 0, USHRT_MAX);
 }
 
 /**
@@ -6915,7 +6915,7 @@ static unsigned short status_calc_wis(struct block_list *bl, status_change *sc,
 * @param spl: Initial spl
 * @return modified spl with cap_value(spl,0,USHRT_MAX)
 */
-static unsigned short status_calc_spl(struct block_list *bl, status_change *sc, int32 spl)
+static uint16 status_calc_spl(struct block_list *bl, status_change *sc, int32 spl)
 {
 	if (sc == nullptr || sc->empty())
 		return cap_value(spl, 0, USHRT_MAX);
@@ -6925,7 +6925,7 @@ static unsigned short status_calc_spl(struct block_list *bl, status_change *sc,
 	if (sc->getSCE(SC_SANDY_FESTIVAL) != nullptr)
 		spl += sc->getSCE(SC_SANDY_FESTIVAL)->val2;
 
-	return (unsigned short)cap_value(spl, 0, USHRT_MAX);
+	return (uint16)cap_value(spl, 0, USHRT_MAX);
 }
 
 /**
@@ -6935,7 +6935,7 @@ static unsigned short status_calc_spl(struct block_list *bl, status_change *sc,
 * @param con: Initial con
 * @return modified con with cap_value(con,0,USHRT_MAX)
 */
-static unsigned short status_calc_con(struct block_list *bl, status_change *sc, int32 con)
+static uint16 status_calc_con(struct block_list *bl, status_change *sc, int32 con)
 {
 	if (sc == nullptr || sc->empty())
 		return cap_value(con, 0, USHRT_MAX);
@@ -6945,7 +6945,7 @@ static unsigned short status_calc_con(struct block_list *bl, status_change *sc,
 	if (sc->getSCE(SC_MARINE_FESTIVAL) != nullptr)
 		con += sc->getSCE(SC_MARINE_FESTIVAL)->val2;
 
-	return (unsigned short)cap_value(con, 0, USHRT_MAX);
+	return (uint16)cap_value(con, 0, USHRT_MAX);
 }
 
 /**
@@ -6955,7 +6955,7 @@ static unsigned short status_calc_con(struct block_list *bl, status_change *sc,
 * @param crt: Initial crt
 * @return modified crt with cap_value(crt,0,USHRT_MAX)
 */
-static unsigned short status_calc_crt(struct block_list *bl, status_change *sc, int32 crt)
+static uint16 status_calc_crt(struct block_list *bl, status_change *sc, int32 crt)
 {
 	if (sc == nullptr || sc->empty())
 		return cap_value(crt, 0, USHRT_MAX);
@@ -6965,7 +6965,7 @@ static unsigned short status_calc_crt(struct block_list *bl, status_change *sc,
 	if (sc->getSCE(SC_MARINE_FESTIVAL) != nullptr)
 		crt += sc->getSCE(SC_MARINE_FESTIVAL)->val2;
 
-	return (unsigned short)cap_value(crt, 0, USHRT_MAX);
+	return (uint16)cap_value(crt, 0, USHRT_MAX);
 }
 
 /**
@@ -6975,7 +6975,7 @@ static unsigned short status_calc_crt(struct block_list *bl, status_change *sc,
  * @param batk: Initial batk
  * @return modified batk with cap_value(batk,0,USHRT_MAX)
  */
-static unsigned short status_calc_batk(struct block_list *bl, status_change *sc, int32 batk)
+static uint16 status_calc_batk(struct block_list *bl, status_change *sc, int32 batk)
 {
 	if(sc == nullptr || sc->empty())
 		return cap_value(batk,0,USHRT_MAX);
@@ -7009,7 +7009,7 @@ static unsigned short status_calc_batk(struct block_list *bl, status_change *sc,
 	if (sc->getSCE(SC_INTENSIVE_AIM))
 		batk += 150;
 
-	return (unsigned short)cap_value(batk,0,USHRT_MAX);
+	return (uint16)cap_value(batk,0,USHRT_MAX);
 }
 
 /**
@@ -7019,7 +7019,7 @@ static unsigned short status_calc_batk(struct block_list *bl, status_change *sc,
  * @param watk: Initial watk
  * @return modified watk with cap_value(watk,0,USHRT_MAX)
  */
-static unsigned short status_calc_watk(struct block_list *bl, status_change *sc, int32 watk)
+static uint16 status_calc_watk(struct block_list *bl, status_change *sc, int32 watk)
 {
 	if(sc == nullptr || sc->empty())
 		return cap_value(watk,0,USHRT_MAX);
@@ -7101,7 +7101,7 @@ static unsigned short status_calc_watk(struct block_list *bl, status_change *sc,
 	if (sc->getSCE(SC_GUARD_STANCE))
 		watk -= sc->getSCE(SC_GUARD_STANCE)->val3;
 
-	return (unsigned short)cap_value(watk,0,USHRT_MAX);
+	return (uint16)cap_value(watk,0,USHRT_MAX);
 }
 
 /**
@@ -7700,13 +7700,13 @@ static signed short status_calc_mdef2(struct block_list *bl, status_change *sc,
  * @param speed: Initial speed
  * @return modified speed with cap_value(speed,10,USHRT_MAX)
  */
-static unsigned short status_calc_speed(struct block_list *bl, status_change *sc, int32 speed)
+static uint16 status_calc_speed(struct block_list *bl, status_change *sc, int32 speed)
 {
 	TBL_PC* sd = BL_CAST(BL_PC, bl);
 	int32 speed_rate = 100;
 
 	if (sc == nullptr || (sd && sd->state.permanent_speed))
-		return (unsigned short)cap_value(speed, MIN_WALK_SPEED, MAX_WALK_SPEED);
+		return (uint16)cap_value(speed, MIN_WALK_SPEED, MAX_WALK_SPEED);
 
 	if (sd && pc_ismadogear(sd)) { // Mado speed is not affected by other statuses
 		int32 val = 0;
@@ -7719,7 +7719,7 @@ static unsigned short status_calc_speed(struct block_list *bl, status_change *sc
 			val -= 25;
 		speed += speed * val / 100;
 
-		return (unsigned short)cap_value(speed, MIN_WALK_SPEED, MAX_WALK_SPEED);
+		return (uint16)cap_value(speed, MIN_WALK_SPEED, MAX_WALK_SPEED);
 	}
 
 	if( sd && sd->ud.skilltimer != INVALID_TIMER && (pc_checkskill(sd,SA_FREECAST) > 0 || sd->ud.skill_id == LG_EXEEDBREAK) ) {
@@ -7903,7 +7903,7 @@ static unsigned short status_calc_speed(struct block_list *bl, status_change *sc
 	if( sc->getSCE(SC_WALKSPEED) && sc->getSCE(SC_WALKSPEED)->val1 > 0 ) // ChangeSpeed
 		speed = speed * 100 / sc->getSCE(SC_WALKSPEED)->val1;
 
-	return (unsigned short)cap_value(speed, MIN_WALK_SPEED, MAX_WALK_SPEED);
+	return (uint16)cap_value(speed, MIN_WALK_SPEED, MAX_WALK_SPEED);
 }
 
 #ifdef RENEWAL_ASPD
@@ -8232,7 +8232,7 @@ static short status_calc_aspd_rate(struct block_list *bl, status_change *sc, int
  * @param dmotion: Object's current damage delay
  * @return modified delay rate
  */
-static unsigned short status_calc_dmotion(struct block_list *bl, status_change *sc, int32 dmotion)
+static uint16 status_calc_dmotion(struct block_list *bl, status_change *sc, int32 dmotion)
 {
 	/// It has been confirmed on official servers that MvP mobs have no dmotion even without endure
 	if( bl->type == BL_MOB && status_get_class_(bl) == CLASS_BOSS )
@@ -8240,7 +8240,7 @@ static unsigned short status_calc_dmotion(struct block_list *bl, status_change *
 
 	if (bl->type == BL_PC) {
 		if (map_flag_gvg2(bl->m) || map_getmapflag(bl->m, MF_BATTLEGROUND))
-			return (unsigned short)cap_value(dmotion, 0, USHRT_MAX);
+			return (uint16)cap_value(dmotion, 0, USHRT_MAX);
 
 		if (((TBL_PC *)bl)->special_state.no_walk_delay)
 			return 0;
@@ -8249,7 +8249,7 @@ static unsigned short status_calc_dmotion(struct block_list *bl, status_change *
 	if (sc != nullptr && !sc->empty() && (sc->getSCE(SC_ENDURE) || sc->getSCE(SC_RUN) || sc->getSCE(SC_WUGDASH)))
 		return 0;
 
-	return (unsigned short)cap_value(dmotion,0,USHRT_MAX);
+	return (uint16)cap_value(dmotion,0,USHRT_MAX);
 }
 
 /**
@@ -8799,7 +8799,7 @@ defType status_get_def(struct block_list *bl)
  * @param bl: Object whose speed to get [PC|MOB|PET|HOM|MER|ELEM|NPC]
  * @return speed
  */
-unsigned short status_get_speed(struct block_list *bl)
+uint16 status_get_speed(struct block_list *bl)
 {
 	// TODO: is the statement of Skotlex still true? And would it not be better to check for dummy_status instead? [Lemongrass]
 	if(bl->type==BL_NPC)// Only BL with speed data but no status_data [Skotlex]
@@ -11257,7 +11257,7 @@ int32 status_change_start(struct block_list* src, struct block_list* bl,enum sc_
 					int32 pos =  (bl->x&0xFFFF)|(bl->y<<16), // Current Coordinates
 					map_idx =  sd->mapindex; // Current Map
 					// 1. Place in Jail (val2 -> Jail Map, val3 -> x, val4 -> y
-					pc_setpos(sd,(unsigned short)val2,val3,val4, CLR_TELEPORT);
+					pc_setpos(sd,(uint16)val2,val3,val4, CLR_TELEPORT);
 					// 2. Set restore point (val3 -> return map, val4 return coords
 					val3 = map_idx;
 					val4 = pos;
@@ -13305,7 +13305,7 @@ int32 status_change_end(struct block_list* bl, enum sc_type type, int32 tid)
 			break;
 		case SC_JAILED:
 			if(sd && sd->mapindex == sce->val2)
-				pc_setpos(sd,(unsigned short)sce->val3,sce->val4&0xFFFF, sce->val4>>16, CLR_TELEPORT);
+				pc_setpos(sd,(uint16)sce->val3,sce->val4&0xFFFF, sce->val4>>16, CLR_TELEPORT);
 			break; // Guess hes not in jail :P
 		case SC_CHANGE:
 			if (tid == INVALID_TIMER)

src/map/status.hpp

@@ -3278,11 +3278,11 @@ enum e_refine_chance_type {
 * Required because players have two of these, one in status_data
 * and another for their left hand weapon. */
 struct weapon_atk {
-	unsigned short atk, atk2;
-	unsigned short range;
+	uint16 atk, atk2;
+	uint16 range;
 	unsigned char ele;
 #ifdef RENEWAL
-	unsigned short matk;
+	uint16 matk;
 	unsigned char wlv;
 #endif
 };
@@ -3300,7 +3300,7 @@ struct status_data {
 		str, agi, vit, int_, dex, luk,
 		pow, sta, wis, spl, con, crt,
 		eatk;
-	unsigned short
+	uint16
 		batk,
 #ifdef RENEWAL
 		watk,
@@ -3336,7 +3336,7 @@ struct status_data {
 
 ///Additional regen data that only players have.
 struct regen_data_sub {
-	unsigned short
+	uint16
 		hp,sp;
 
 	//tick accumulation before healing.
@@ -3347,14 +3347,14 @@ struct regen_data_sub {
 
 	//Regen rates. n/100
 	struct {
-		unsigned short hp,sp;
+		uint16 hp,sp;
 	} rate;
 };
 
 ///Regen data
 struct regen_data {
 	unsigned char flag; //Marks what stuff you may heal or not.
-	unsigned short hp,sp,shp,ssp;
+	uint16 hp,sp,shp,ssp;
 
 	//tick accumulation before healing.
 	struct {
@@ -3365,7 +3365,7 @@ struct regen_data {
 
 	//Regen rates. n/100
 	struct {
-		unsigned short hp, sp, shp, ssp;
+		uint16 hp, sp, shp, ssp;
 	} rate;
 
 	struct {
@@ -3396,8 +3396,8 @@ class status_change {
 public:
 	uint32 option;// effect state (bitfield)
 	uint32 opt3;// skill state (bitfield)
-	unsigned short opt1;// body state
-	unsigned short opt2;// health state (bitfield)
+	uint16 opt1;// body state
+	uint16 opt2;// health state (bitfield)
 	unsigned char count;
 	sc_type lastEffect; // Used to check for stacking damageable SC on the same attack
 	int32 lastEffectTimer; // Timer for lastEffect
@@ -3530,7 +3530,7 @@ defType status_get_def(struct block_list *bl);
 #define status_get_matk_min(bl) status_get_status_data(*bl)->matk_min
 #define status_get_lwatk(bl) status_get_status_data(*bl)->lhw.atk
 #define status_get_lwatk2(bl) status_get_status_data(*bl)->lhw.atk2
-unsigned short status_get_speed(struct block_list *bl);
+uint16 status_get_speed(struct block_list *bl);
 #define status_get_adelay(bl) status_get_status_data(*bl)->adelay
 #define status_get_amotion(bl) status_get_status_data(*bl)->amotion
 #define status_get_clientamotion(bl) status_get_status_data(*bl)->clientamotion
@@ -3637,19 +3637,19 @@ int32 status_check_visibility(struct block_list *src, struct block_list *target)
 int32 status_change_spread(block_list *src, block_list *bl);
 
 #ifndef RENEWAL
-unsigned short status_base_matk_min(const struct status_data* status);
-unsigned short status_base_matk_max(const struct status_data* status);
+uint16 status_base_matk_min(const struct status_data* status);
+uint16 status_base_matk_max(const struct status_data* status);
 #else
 uint32 status_weapon_atk(struct weapon_atk wa, map_session_data *sd);
-unsigned short status_base_atk_min(struct block_list *bl, const struct status_data* status, int32 level);
-unsigned short status_base_atk_max(struct block_list *bl, const struct status_data* status, int32 level);
-unsigned short status_base_matk_min(struct block_list *bl, const struct status_data* status, int32 level);
-unsigned short status_base_matk_max(struct block_list *bl, const struct status_data* status, int32 level);
+uint16 status_base_atk_min(struct block_list *bl, const struct status_data* status, int32 level);
+uint16 status_base_atk_max(struct block_list *bl, const struct status_data* status, int32 level);
+uint16 status_base_matk_min(struct block_list *bl, const struct status_data* status, int32 level);
+uint16 status_base_matk_max(struct block_list *bl, const struct status_data* status, int32 level);
 #endif
 uint16 status_calc_consumablematk( status_change *sc, int32 matk );
 uint16 status_calc_pseudobuff_matk( map_session_data *sd, status_change *sc, int32 matk );
 
-unsigned short status_base_atk(const struct block_list *bl, const struct status_data *status, int32 level);
+uint16 status_base_atk(const struct block_list *bl, const struct status_data *status, int32 level);
 
 // Status changes accessors for StatusChange database
 uint16 status_efst_get_bl_type(enum efst_type efst);

src/map/unit.cpp

@@ -1025,7 +1025,7 @@ bool unit_run(struct block_list *bl, map_session_data *sd, enum sc_type type)
 t_tick unit_get_walkpath_time(struct block_list& bl)
 {
 	t_tick time = 0;
-	unsigned short speed = status_get_speed(&bl);
+	uint16 speed = status_get_speed(&bl);
 	struct unit_data* ud = unit_bl2ud(&bl);
 
 	// The next walk start time is calculated.