diff options
| author | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
| commit | 7fefefdde386f13f8fefa8db3ffe9ed140c8aa10 (patch) | |
| tree | 715f3b80d75cab3a9c2a3abd04ae4461165e8854 /src/map/guild.c | |
| parent | a2405882a4123d6a11d24e895b40148dc7cb455e (diff) | |
| parent | bd04c6c566902d03d633b4dfee5335361155a79e (diff) | |
| download | hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.gz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.bz2 hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.xz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/map/guild.c')
| -rw-r--r-- | src/map/guild.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index 9b3eaaff8..0ae45bede 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -279,8 +279,7 @@ int guild_payexp_timer_sub(DBKey key, DBData *data, va_list ap) { return 0; } -int guild_payexp_timer(int tid, unsigned int tick, int id, intptr_t data) -{ +int guild_payexp_timer(int tid, int64 tick, int id, intptr_t data) { guild->expcache_db->clear(guild->expcache_db,guild->payexp_timer_sub); return 0; } @@ -314,8 +313,7 @@ int guild_send_xy_timer_sub(DBKey key, DBData *data, va_list ap) } //Code from party_send_xy_timer [Skotlex] -int guild_send_xy_timer(int tid, unsigned int tick, int id, intptr_t data) -{ +int guild_send_xy_timer(int tid, int64 tick, int id, intptr_t data) { guild->db->foreach(guild->db,guild->send_xy_timer_sub,tick); return 0; } |