Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing some timestamp type difference warnings...

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12669 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2008-04-27 20:03:25 +00:00
parent fc5918e335
commit 155416f712
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/char_sql/int_auction.c
View File

@ -177,7 +177,8 @@ void inter_auctions_fromsql(void)
struct item *item; struct item *item;
char *data; char *data;
StringBuf buf; StringBuf buf;
unsigned int tick = gettick(), endtick, now = time(NULL); unsigned int tick = gettick(), endtick;
time_t now = time(NULL);
StringBuf_Init(&buf); StringBuf_Init(&buf);
StringBuf_AppendStr(&buf, "SELECT `auction_id`,`seller_id`,`seller_name`,`buyer_id`,`buyer_name`," 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 ) if( auction->timestamp > now )
endtick = ((auction->timestamp - now) * 1000) + tick; endtick = ((unsigned int)(auction->timestamp - now) * 1000) + tick;
else else
endtick = tick + 10000; // 10 Second's to process ended auctions endtick = tick + 10000; // 10 Second's to process ended auctions

4
src/common/mmo.h
View File

@ -289,7 +289,7 @@ struct mail_message {
char body[MAIL_BODY_LENGTH]; char body[MAIL_BODY_LENGTH];
mail_status status; mail_status status;
unsigned int timestamp; // marks when the message was sent time_t timestamp; // marks when the message was sent
int zeny; int zeny;
struct item item; struct item item;
@ -316,7 +316,7 @@ struct auction_data {
unsigned short hours; unsigned short hours;
int price, buynow; int price, buynow;
unsigned int timestamp; // auction's end time time_t timestamp; // auction's end time
int auction_end_timer; int auction_end_timer;
}; };

4
src/map/clif.c
View File

@ -11414,7 +11414,7 @@ void clif_Mail_refreshinbox(struct map_session_data *sd)
memcpy(WFIFOP(fd,12+73*j), msg->title, MAIL_TITLE_LENGTH); memcpy(WFIFOP(fd,12+73*j), msg->title, MAIL_TITLE_LENGTH);
WFIFOB(fd,52+73*j) = (msg->status != MAIL_UNREAD); // 0: unread, 1: read WFIFOB(fd,52+73*j) = (msg->status != MAIL_UNREAD); // 0: unread, 1: read
memcpy(WFIFOP(fd,53+73*j), msg->send_name, NAME_LENGTH); 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++; j++;
} }
WFIFOSET(fd,len); 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,47+k) = auction.price;
WFIFOL(fd,51+k) = auction.buynow; WFIFOL(fd,51+k) = auction.buynow;
safestrncpy((char*)WFIFOP(fd,55+k), auction.buyer_name, NAME_LENGTH); 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)); WFIFOSET(fd, 12 + (count * 83));
} }