From bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8 Mon Sep 17 00:00:00 2001 From: FlavioJS Date: Mon, 21 Apr 2008 21:34:31 +0000 Subject: * Changed the data field of timers from int to intptr. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12633 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/char_sql/char.c | 16 ++++++++-------- src/char_sql/int_auction.c | 4 ++-- src/char_sql/int_guild.c | 2 +- src/char_sql/inter.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/char_sql') diff --git a/src/char_sql/char.c b/src/char_sql/char.c index 8066dc629..eef4fa2a0 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -199,7 +199,7 @@ struct online_char_data { }; static DBMap* online_char_db; // int account_id -> struct online_char_data* -static int chardb_waiting_disconnect(int tid, unsigned int tick, int id, int data); +static int chardb_waiting_disconnect(int tid, unsigned int tick, int id, intptr data); static void* create_online_char_data(DBKey key, va_list args) { @@ -1647,7 +1647,7 @@ static void char_auth_ok(int fd, struct char_session_data *sd) mmo_char_send006b(fd, sd); } -int send_accounts_tologin(int tid, unsigned int tick, int id, int data); +int send_accounts_tologin(int tid, unsigned int tick, int id, intptr data); int parse_fromlogin(int fd) { @@ -3423,7 +3423,7 @@ int mapif_send(int fd, unsigned char *buf, unsigned int len) return 0; } -int broadcast_user_count(int tid, unsigned int tick, int id, int data) +int broadcast_user_count(int tid, unsigned int tick, int id, intptr data) { uint8 buf[6]; int users = count_users(); @@ -3466,7 +3466,7 @@ static int send_accounts_tologin_sub(DBKey key, void* data, va_list ap) return 0; } -int send_accounts_tologin(int tid, unsigned int tick, int id, int data) +int send_accounts_tologin(int tid, unsigned int tick, int id, intptr data) { if (login_fd > 0 && session[login_fd]) { @@ -3484,7 +3484,7 @@ int send_accounts_tologin(int tid, unsigned int tick, int id, int data) return 0; } -int check_connect_login_server(int tid, unsigned int tick, int id, int data) +int check_connect_login_server(int tid, unsigned int tick, int id, intptr data) { if (login_fd > 0 && session[login_fd] != NULL) return 0; @@ -3517,7 +3517,7 @@ int check_connect_login_server(int tid, unsigned int tick, int id, int data) } // sends a ping packet to login server (will receive pong 0x2718) -int ping_login_server(int tid, unsigned int tick, int id, int data) +int ping_login_server(int tid, unsigned int tick, int id, intptr data) { if (login_fd > 0 && session[login_fd] != NULL) { @@ -3532,7 +3532,7 @@ int ping_login_server(int tid, unsigned int tick, int id, int data) //Invoked 15 seconds after mapif_disconnectplayer in case the map server doesn't //replies/disconnect the player we tried to kick. [Skotlex] //------------------------------------------------ -static int chardb_waiting_disconnect(int tid, unsigned int tick, int id, int data) +static int chardb_waiting_disconnect(int tid, unsigned int tick, int id, intptr data) { struct online_char_data* character; if ((character = (struct online_char_data*)idb_get(online_char_db, id)) != NULL && character->waiting_disconnect == tid) @@ -3556,7 +3556,7 @@ static int online_data_cleanup_sub(DBKey key, void *data, va_list ap) return 0; } -static int online_data_cleanup(int tid, unsigned int tick, int id, int data) +static int online_data_cleanup(int tid, unsigned int tick, int id, intptr data) { online_char_db->foreach(online_char_db, online_data_cleanup_sub); return 0; diff --git a/src/char_sql/int_auction.c b/src/char_sql/int_auction.c index 84f0ff424..ca99086c7 100644 --- a/src/char_sql/int_auction.c +++ b/src/char_sql/int_auction.c @@ -20,7 +20,7 @@ static DBMap* auction_db_ = NULL; // int auction_id -> struct auction_data* void auction_delete(struct auction_data *auction); -static int auction_end_timer(int tid, unsigned int tick, int id, int data); +static int auction_end_timer(int tid, unsigned int tick, int id, intptr data); static int auction_count(int char_id, bool buy) { @@ -134,7 +134,7 @@ static void mapif_Auction_message(int char_id, unsigned char result) mapif_sendall(buf,7); } -static int auction_end_timer(int tid, unsigned int tick, int id, int data) +static int auction_end_timer(int tid, unsigned int tick, int id, intptr data) { struct auction_data *auction; if( (auction = (struct auction_data *)idb_get(auction_db_, id)) != NULL ) diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c index 3ff05ddf1..a63bc951b 100644 --- a/src/char_sql/int_guild.c +++ b/src/char_sql/int_guild.c @@ -47,7 +47,7 @@ int mapif_guild_info(int fd,struct guild *g); int guild_break_sub(int key,void *data,va_list ap); int inter_guild_tosql(struct guild *g,int flag); -static int guild_save_timer(int tid, unsigned int tick, int id, int data) +static int guild_save_timer(int tid, unsigned int tick, int id, intptr data) { static int last_id = 0; //To know in which guild we were. int state = 0; //0: Have not reached last guild. 1: Reached last guild, ready for save. 2: Some guild saved, don't do further saving. diff --git a/src/char_sql/inter.c b/src/char_sql/inter.c index d11d7ee95..261ed9b0d 100644 --- a/src/char_sql/inter.c +++ b/src/char_sql/inter.c @@ -300,7 +300,7 @@ int inter_log(char* fmt, ...) /*============================================= * Does a mysql_ping to all connection handles *---------------------------------------------*/ -int inter_sql_ping(int tid, unsigned int tick, int id, int data) +int inter_sql_ping(int tid, unsigned int tick, int id, intptr data) { ShowInfo("Pinging SQL server to keep connection alive...\n"); Sql_Ping(sql_handle); -- cgit v1.2.3-70-g09d2