diff options
| author | shennetsind <ind@henn.et> | 2013-09-25 09:07:33 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-09-25 09:07:33 -0300 |
| commit | 13afb7e0bf35bacc9c90c7dffe34120ddd2fd099 (patch) | |
| tree | 180c739ac69aceab8ce4cc6151030539a32ac8c3 /src/map/battleground.h | |
| parent | 1114eb3da58b078258a824424fef687a1ccee90c (diff) | |
| parent | 66979ef89363c03e3cc02d63feb5248836daff4e (diff) | |
| download | hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.tar.gz hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.tar.bz2 hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.tar.xz hercules-13afb7e0bf35bacc9c90c7dffe34120ddd2fd099.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Conflicts:
src/map/chrif.c
src/map/clif.c
src/map/homunculus.c
src/map/pet.c
src/map/script.c
src/map/skill.c
src/map/status.c
All clear.
Diffstat (limited to 'src/map/battleground.h')
| -rw-r--r-- | src/map/battleground.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battleground.h b/src/map/battleground.h index 3edecf902..1c224e1c2 100644 --- a/src/map/battleground.h +++ b/src/map/battleground.h @@ -91,7 +91,7 @@ struct battleground_interface { void (*match_over) (struct bg_arena *arena, bool canceled); void (*queue_check) (struct bg_arena *arena); struct battleground_data* (*team_search) (int bg_id); - struct map_session_data* (*getavailablesd) (struct battleground_data *bg); + struct map_session_data* (*getavailablesd) (struct battleground_data *bgd); int (*team_delete) (int bg_id); int (*team_warp) (int bg_id, unsigned short mapindex, short x, short y); int (*send_dot_remove) (struct map_session_data *sd); |