diff options
| author | Euphy <euphy@rathena.org> | 2013-06-20 22:29:03 -0400 |
|---|---|---|
| committer | Euphy <euphy@rathena.org> | 2013-06-20 22:29:03 -0400 |
| commit | 86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528 (patch) | |
| tree | df955a23899586104e67359dc490891221b2875b /src/map/battleground.h | |
| parent | caa8a41b40a5ce3c96eb793619ff75f191ca558b (diff) | |
| parent | 0f7c29113d7d898150108d66d1358f15bb018e0a (diff) | |
| download | hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.tar.gz hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.tar.bz2 hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.tar.xz hercules-86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
conf/plugins.conf
db/pre-re/skill_tree.txt
db/re/skill_tree.txt
db/sc_config.txt
npc/mobs/citycleaners.txt
src/map/atcommand.c
src/map/battle.c
src/map/clif.c
src/map/map.c
src/map/packets.h
src/map/pc.c
src/map/script.c
src/map/skill.c
src/map/status.c
src/map/storage.c
src/map/trade.h
Merged master.
Diffstat (limited to 'src/map/battleground.h')
| -rw-r--r-- | src/map/battleground.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/map/battleground.h b/src/map/battleground.h index 8fe9f3b77..030d13d90 100644 --- a/src/map/battleground.h +++ b/src/map/battleground.h @@ -96,6 +96,7 @@ struct battleground_interface { int (*begin_timer) (int tid, unsigned int 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); + void (*queue_ready_ack) (struct bg_arena *arena, struct map_session_data *sd, bool response); /* */ void (*config_read) (void); } bg_s; |