diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-10 06:17:06 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-10 06:17:06 +0000 |
| commit | 9ef634559f3cde232586b1dc6fd00bea3f3d8e53 (patch) | |
| tree | 541295af8a6fbfe15b09da353680be6dd4d6b3ff /src/map/guild.c | |
| parent | 9c100697bf79604fcef8b7eedbadeed45c63b41b (diff) | |
| download | hercules-9ef634559f3cde232586b1dc6fd00bea3f3d8e53.tar.gz hercules-9ef634559f3cde232586b1dc6fd00bea3f3d8e53.tar.bz2 hercules-9ef634559f3cde232586b1dc6fd00bea3f3d8e53.tar.xz hercules-9ef634559f3cde232586b1dc6fd00bea3f3d8e53.zip | |
* Merged changes from trunk [14827:14894/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14895 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/guild.c')
| -rw-r--r-- | src/map/guild.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index c80b124ef..0b77aa9a1 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -61,8 +61,8 @@ struct{ }need[6]; } guild_skill_tree[MAX_GUILDSKILL]; -int guild_payexp_timer(int tid, unsigned int tick, int id, intptr data); -static int guild_send_xy_timer(int tid, unsigned int tick, int id, intptr data); +int guild_payexp_timer(int tid, unsigned int tick, int id, intptr_t data); +static int guild_send_xy_timer(int tid, unsigned int tick, int id, intptr_t data); /*========================================== * Retrieves and validates the sd pointer for this guild member [Skotlex] @@ -308,7 +308,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, intptr data) +int guild_payexp_timer(int tid, unsigned int tick, int id, intptr_t data) { guild_expcache_db->clear(guild_expcache_db,guild_payexp_timer_sub); return 0; @@ -336,7 +336,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, intptr data) +static int guild_send_xy_timer(int tid, unsigned int tick, int id, intptr_t data) { guild_db->foreach(guild_db,guild_send_xy_timer_sub,tick); return 0; @@ -1840,7 +1840,7 @@ int guild_castlealldataload(int len,struct guild_castle *gc) } // update mapserver castle data with new info - memcpy(&c->guild_id, &gc->guild_id, sizeof(struct guild_castle) - ((uintptr)&c->guild_id - (uintptr)c)); + memcpy(&c->guild_id, &gc->guild_id, sizeof(struct guild_castle) - ((uintptr_t)&c->guild_id - (uintptr_t)c)); if( c->guild_id ) { |