summaryrefslogtreecommitdiff
path: root/src/char
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-21 21:34:31 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-21 21:34:31 +0000
commitbc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8 (patch)
tree3aa7da07fc43116707de469034c7cf8186e8b2d5 /src/char
parentb21c980c03ea476e324c714a9ad2d5eff5cb981d (diff)
downloadhercules-bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8.tar.gz
hercules-bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8.tar.bz2
hercules-bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8.tar.xz
hercules-bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8.zip
* 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
Diffstat (limited to 'src/char')
-rw-r--r--src/char/char.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/char/char.c b/src/char/char.c
index 5d3975816..c57ba86fa 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -179,7 +179,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)
{
@@ -1131,7 +1131,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, int data)
+int mmo_char_sync_timer(int tid, unsigned int tick, int id, intptr data)
{
if (save_log)
ShowInfo("Saving all files...\n");
@@ -1940,7 +1940,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)
{
@@ -3828,7 +3828,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();
@@ -3874,7 +3874,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])
{
@@ -3892,7 +3892,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;
@@ -3925,7 +3925,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)
{
@@ -3940,7 +3940,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)
@@ -3964,7 +3964,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;