fixing some timestamp type difference warnings...

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12669 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 7 insertions, 6 deletions

diff --git a/src/char_sql/int_auction.c b/src/char_sql/int_auction.c
index e29e01e7a..c5cdf628b 100644
--- a/src/char_sql/int_auction.c
+++ b/src/char_sql/int_auction.c
@@ -177,7 +177,8 @@ void inter_auctions_fromsql(void)
 	struct item *item;
 	char *data;
 	StringBuf buf;
-	unsigned int tick = gettick(), endtick, now = time(NULL);
+	unsigned int tick = gettick(), endtick;
+	time_t now = time(NULL);
 
 	StringBuf_Init(&buf);
 	StringBuf_AppendStr(&buf, "SELECT `auction_id`,`seller_id`,`seller_name`,`buyer_id`,`buyer_name`,"
@@ -222,7 +223,7 @@ void inter_auctions_fromsql(void)
 		}
 
 		if( auction->timestamp > now )
-			endtick = ((auction->timestamp - now) * 1000) + tick;
+			endtick = ((unsigned int)(auction->timestamp - now) * 1000) + tick;
 		else
 			endtick = tick + 10000; // 10 Second's to process ended auctions
 
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 70e7f103d..81ceae5f8 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -289,7 +289,7 @@ struct mail_message {
 	char body[MAIL_BODY_LENGTH];
 
 	mail_status status;
-	unsigned int timestamp; // marks when the message was sent
+	time_t timestamp; // marks when the message was sent
 
 	int zeny;
 	struct item item;
@@ -316,7 +316,7 @@ struct auction_data {
 
 	unsigned short hours;
 	int price, buynow;
-	unsigned int timestamp; // auction's end time
+	time_t timestamp; // auction's end time
 	int auction_end_timer;
 };
 
diff --git a/src/map/clif.c b/src/map/clif.c
index 985871cc7..d06e2bd07 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11414,7 +11414,7 @@ void clif_Mail_refreshinbox(struct map_session_data *sd)
 		memcpy(WFIFOP(fd,12+73*j), msg->title, MAIL_TITLE_LENGTH);
 		WFIFOB(fd,52+73*j) = (msg->status != MAIL_UNREAD); // 0: unread, 1: read
 		memcpy(WFIFOP(fd,53+73*j), msg->send_name, NAME_LENGTH);
-		WFIFOL(fd,77+73*j) = msg->timestamp;
+		WFIFOL(fd,77+73*j) = (uint32)msg->timestamp;
 		j++;
 	}
 	WFIFOSET(fd,len);
@@ -11763,7 +11763,7 @@ void clif_Auction_results(struct map_session_data *sd, short count, short pages,
 		WFIFOL(fd,47+k) = auction.price;
 		WFIFOL(fd,51+k) = auction.buynow;
 		safestrncpy((char*)WFIFOP(fd,55+k), auction.buyer_name, NAME_LENGTH);
-		WFIFOL(fd,79+k) = auction.timestamp;
+		WFIFOL(fd,79+k) = (uint32)auction.timestamp;
 	}
 	WFIFOSET(fd, 12 + (count * 83));
 }