summaryrefslogtreecommitdiff
path: root/src/map/battleground.h
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-10-27 15:00:54 -0200
committershennetsind <ind@henn.et>2013-10-27 15:00:54 -0200
commita1c3a358aefa46b37e6745f9c54cc6df14ea6ba4 (patch)
tree200bfbff424724d1c324527359fce2c96c957957 /src/map/battleground.h
parentbaef78f7954fa4e6fa2449f2c7de92a901c7f5f3 (diff)
parente6a1225802e01ad5390c033ca7a4653c1a976c24 (diff)
downloadhercules-a1c3a358aefa46b37e6745f9c54cc6df14ea6ba4.tar.gz
hercules-a1c3a358aefa46b37e6745f9c54cc6df14ea6ba4.tar.bz2
hercules-a1c3a358aefa46b37e6745f9c54cc6df14ea6ba4.tar.xz
hercules-a1c3a358aefa46b37e6745f9c54cc6df14ea6ba4.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/battleground.h')
-rw-r--r--src/map/battleground.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/battleground.h b/src/map/battleground.h
index 1c224e1c2..a5e540924 100644
--- a/src/map/battleground.h
+++ b/src/map/battleground.h
@@ -84,9 +84,9 @@ struct battleground_interface {
int (*id2pos) (int queue_id, int account_id);
void (*queue_pc_cleanup) (struct map_session_data *sd);
void (*begin) (struct bg_arena *arena);
- int (*begin_timer) (int tid, unsigned int tick, int id, intptr_t data);
+ int (*begin_timer) (int tid, int64 tick, int id, intptr_t data);
void (*queue_pregame) (struct bg_arena *arena);
- int (*fillup_timer) (int tid, unsigned int tick, int id, intptr_t data);
+ int (*fillup_timer) (int tid, int64 tick, int id, intptr_t data);
void (*queue_ready_ack) (struct bg_arena *arena, struct map_session_data *sd, bool response);
void (*match_over) (struct bg_arena *arena, bool canceled);
void (*queue_check) (struct bg_arena *arena);
@@ -102,7 +102,7 @@ struct battleground_interface {
int (*team_get_id) (struct block_list *bl);
int (*send_message) (struct map_session_data *sd, const char *mes, int len);
int (*send_xy_timer_sub) (DBKey key, DBData *data, va_list ap);
- int (*send_xy_timer) (int tid, unsigned int tick, int id, intptr_t data);
+ int (*send_xy_timer) (int tid, int64 tick, int id, intptr_t data);
/* */
void (*config_read) (void);
};