diff options
author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-06-30 09:14:21 +0000 |
---|---|---|
committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-06-30 09:14:21 +0000 |
commit | 09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf (patch) | |
tree | 9971dee8e7148436dcb49af51bb820d764f10c21 /src/char/char.c | |
parent | dd73c6ea546a8828653cdce38a52f575cbdd3b96 (diff) | |
download | hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.tar.gz hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.tar.bz2 hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.tar.xz hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.zip |
Replaced custom type 'intptr' with standard 'intptr_t'.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14873 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char/char.c')
-rw-r--r-- | src/char/char.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/char/char.c b/src/char/char.c index 040c05955..617e3d10c 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -176,7 +176,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, intptr data); +static int chardb_waiting_disconnect(int tid, unsigned int tick, int id, intptr_t data); static void* create_online_char_data(DBKey key, va_list args) { @@ -1229,7 +1229,7 @@ void mmo_char_sync(void) //---------------------------------------------------- // Function to save (in a periodic way) datas in files //---------------------------------------------------- -int mmo_char_sync_timer(int tid, unsigned int tick, int id, intptr data) +int mmo_char_sync_timer(int tid, unsigned int tick, int id, intptr_t data) { if (save_log) ShowInfo("Saving all files...\n"); @@ -2060,7 +2060,7 @@ static void char_auth_ok(int fd, struct char_session_data *sd) // continues when account data is received... } -int send_accounts_tologin(int tid, unsigned int tick, int id, intptr data); +int send_accounts_tologin(int tid, unsigned int tick, int id, intptr_t data); void mapif_server_reset(int id); @@ -2422,9 +2422,9 @@ int parse_fromlogin(int fd) return 0; } -int check_connect_login_server(int tid, unsigned int tick, int id, intptr data); -int ping_login_server(int tid, unsigned int tick, int id, intptr data); -int send_accounts_tologin(int tid, unsigned int tick, int id, intptr data); +int check_connect_login_server(int tid, unsigned int tick, int id, intptr_t data); +int ping_login_server(int tid, unsigned int tick, int id, intptr_t data); +int send_accounts_tologin(int tid, unsigned int tick, int id, intptr_t data); void do_init_loginif(void) { @@ -4194,7 +4194,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, intptr data) +int broadcast_user_count(int tid, unsigned int tick, int id, intptr_t data) { uint8 buf[6]; int users = count_users(); @@ -4240,7 +4240,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, intptr data) +int send_accounts_tologin(int tid, unsigned int tick, int id, intptr_t data) { if (login_fd > 0 && session[login_fd]) { @@ -4258,7 +4258,7 @@ int send_accounts_tologin(int tid, unsigned int tick, int id, intptr data) return 0; } -int check_connect_login_server(int tid, unsigned int tick, int id, intptr data) +int check_connect_login_server(int tid, unsigned int tick, int id, intptr_t data) { if (login_fd > 0 && session[login_fd] != NULL) return 0; @@ -4291,7 +4291,7 @@ int check_connect_login_server(int tid, unsigned int tick, int id, intptr data) } // sends a ping packet to login server (will receive pong 0x2718) -int ping_login_server(int tid, unsigned int tick, int id, intptr data) +int ping_login_server(int tid, unsigned int tick, int id, intptr_t data) { if (login_fd > 0 && session[login_fd] != NULL) { @@ -4306,7 +4306,7 @@ int ping_login_server(int tid, unsigned int tick, int id, intptr 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, intptr data) +static int chardb_waiting_disconnect(int tid, unsigned int tick, int id, intptr_t data) { struct online_char_data* character; if ((character = (struct online_char_data*)idb_get(online_char_db, id)) != NULL && character->waiting_disconnect == tid) @@ -4330,7 +4330,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, intptr data) +static int online_data_cleanup(int tid, unsigned int tick, int id, intptr_t data) { online_char_db->foreach(online_char_db, online_data_cleanup_sub); return 0; |