diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-21 21:34:31 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-21 21:34:31 +0000 |
| commit | bc9e0854a2c7336c6f7b4a388b5ff00b9f4865e8 (patch) | |
| tree | 3aa7da07fc43116707de469034c7cf8186e8b2d5 /src/map/guild.c | |
| parent | b21c980c03ea476e324c714a9ad2d5eff5cb981d (diff) | |
| download | hercules-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/map/guild.c')
| -rw-r--r-- | src/map/guild.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index f008f7abf..92e721042 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -65,9 +65,9 @@ struct{ #define GUILD_SAVE_INTERVAL 300000 int guild_save_timer = -1; -int guild_payexp_timer(int tid,unsigned int tick,int id,int data); -int guild_save_sub(int tid,unsigned int tick,int id,int data); -static int guild_send_xy_timer(int tid,unsigned int tick,int id,int data); +int guild_payexp_timer(int tid, unsigned int tick, int id, intptr data); +int guild_save_sub(int tid, unsigned int tick, int id, intptr data); +static int guild_send_xy_timer(int tid, unsigned int tick, int id, intptr data); /*========================================== * Retrieves and validates the sd pointer for this guild member [Skotlex] @@ -355,7 +355,7 @@ int guild_payexp_timer_sub(DBKey dataid, void *data, va_list ap) return 0; } -int guild_payexp_timer(int tid, unsigned int tick, int id, int data) +int guild_payexp_timer(int tid, unsigned int tick, int id, intptr data) { guild_expcache_db->clear(guild_expcache_db,guild_payexp_timer_sub); return 0; @@ -383,7 +383,7 @@ int guild_send_xy_timer_sub(DBKey key,void *data,va_list ap) } //Code from party_send_xy_timer [Skotlex] -static int guild_send_xy_timer(int tid,unsigned int tick,int id,int data) +static int guild_send_xy_timer(int tid, unsigned int tick, int id, intptr data) { guild_db->foreach(guild_db,guild_send_xy_timer_sub,tick); return 0; @@ -1899,7 +1899,7 @@ int guild_agit_end(void) return 0; } -int guild_save_sub(int tid,unsigned int tick,int id,int data) +int guild_save_sub(int tid, unsigned int tick, int id, intptr data) { static int Gid[MAX_GUILDCASTLE]; // previous owning guild struct guild_castle *gc; |