Follow up 214ff17c1955aaaab34c88faea0dedb97600660e, fixed errors and warnings in MSVS

Signed-off-by: Cydh Ramdh <cydh@pservero.com>

src/char/char.c

@@ -1753,12 +1753,12 @@ int char_mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
 	WBUFW(buf,70) = p->hair_color;
 	WBUFW(buf,72) = p->clothes_color;
 	memcpy(WBUFP(buf,74), p->name, NAME_LENGTH);
-	WBUFB(buf,98) = u16min(p->str, UINT8_MAX);
-	WBUFB(buf,99) = u16min(p->agi, UINT8_MAX);
-	WBUFB(buf,100) = u16min(p->vit, UINT8_MAX);
-	WBUFB(buf,101) = u16min(p->int_, UINT8_MAX);
-	WBUFB(buf,102) = u16min(p->dex, UINT8_MAX);
-	WBUFB(buf,103) = u16min(p->luk, UINT8_MAX);
+	WBUFB(buf,98) = (unsigned char)u16min(p->str, UINT8_MAX);
+	WBUFB(buf,99) = (unsigned char)u16min(p->agi, UINT8_MAX);
+	WBUFB(buf,100) = (unsigned char)u16min(p->vit, UINT8_MAX);
+	WBUFB(buf,101) = (unsigned char)u16min(p->int_, UINT8_MAX);
+	WBUFB(buf,102) = (unsigned char)u16min(p->dex, UINT8_MAX);
+	WBUFB(buf,103) = (unsigned char)u16min(p->luk, UINT8_MAX);
 	WBUFW(buf,104) = p->slot;
 	WBUFW(buf,106) = ( p->rename > 0 ) ? 0 : 1;
 	offset += 2;

src/common/cbasetypes.h

@@ -396,10 +396,13 @@ void SET_FUNCPOINTER(T1& var, T2 p)
 #define SET_FUNCPOINTER(var,p) (var) = (p)
 #endif
 
-//#ifndef max
-//#define max(a,b) (((a) > (b)) ? (a) : (b))
-//wish we could have template in C
+#ifdef max
+#undef max
+#endif
+
+#ifndef max
 static inline int max(int a, int b){ return (a > b) ? a : b; } //default is int
+#endif
 static inline int8 i8max(int8 a, int8 b){ return (a > b) ? a : b; }
 static inline int16 i16max(int16 a, int16 b){ return (a > b) ? a : b; }
 static inline int32 i32max(int32 a, int32 b){ return (a > b) ? a : b; }
@@ -410,12 +413,14 @@ static inline uint16 u16max(uint16 a, uint16 b){ return (a > b) ? a : b; }
 static inline uint32 u32max(uint32 a, uint32 b){ return (a > b) ? a : b; }
 static inline uint64 u64max(uint64 a, uint64 b){ return (a > b) ? a : b; }
 static inline size_t zmax(size_t a, size_t b){ return (a > b) ? a : b; } //cause those varie
-//#endif
 
-//#ifndef min
-//#define min(a,b) (((a) < (b)) ? (a) : (b))
-//#endif
+#ifdef min
+#undef min
+#endif
+
+#ifndef min
 static inline int min(int a, int b){ return (a < b) ? a : b; } //default is int
+#endif
 static inline int8 i8min(int8 a, int8 b){ return (a < b) ? a : b; }
 static inline int16 i16min(int16 a, int16 b){ return (a < b) ? a : b; }
 static inline int32 i32min(int32 a, int32 b){ return (a < b) ? a : b; }

src/map/pc.c

@@ -4413,7 +4413,7 @@ char pc_additem(struct map_session_data *sd,struct item *item,int amount,e_log_p
 			clif_rental_expired(sd->fd, i, sd->status.inventory[i].nameid);
 			pc_delitem(sd, i, sd->status.inventory[i].amount, 1, 0, LOG_TYPE_OTHER);
 		} else {
-			unsigned int seconds = ( item->expire_time - time(NULL) );
+			unsigned int seconds = (unsigned int)( item->expire_time - time(NULL) );
 			clif_rental_time(sd->fd, sd->status.inventory[i].nameid, seconds);
 			pc_inventory_rental_add(sd, seconds);
 		}