diff options
| author | Haru <haru@dotalux.com> | 2013-12-11 15:01:00 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2013-12-11 15:03:52 +0100 |
| commit | 68d6c8bc110bbecd39c47b0e00445b8b4b5eb278 (patch) | |
| tree | 98804fe393e6559399e5ff0c86a73026c889a1f8 /src/map/battleground.c | |
| parent | 27cf11151de917892b22794c1aa798620a484850 (diff) | |
| download | hercules-68d6c8bc110bbecd39c47b0e00445b8b4b5eb278.tar.gz hercules-68d6c8bc110bbecd39c47b0e00445b8b4b5eb278.tar.bz2 hercules-68d6c8bc110bbecd39c47b0e00445b8b4b5eb278.tar.xz hercules-68d6c8bc110bbecd39c47b0e00445b8b4b5eb278.zip | |
Corrected some local 'mapindex' variables shadowing the global one
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/battleground.c')
| -rw-r--r-- | src/map/battleground.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/battleground.c b/src/map/battleground.c index 6b9695849..6029a8c35 100644 --- a/src/map/battleground.c +++ b/src/map/battleground.c @@ -60,12 +60,12 @@ int bg_team_delete(int bg_id) { } /// Warps a Team -int bg_team_warp(int bg_id, unsigned short mapindex, short x, short y) { +int bg_team_warp(int bg_id, unsigned short map_index, short x, short y) { int i; struct battleground_data *bgd = bg->team_search(bg_id); if( bgd == NULL ) return 0; for( i = 0; i < MAX_BG_MEMBERS; i++ ) - if( bgd->members[i].sd != NULL ) pc->setpos(bgd->members[i].sd, mapindex, x, y, CLR_TELEPORT); + if( bgd->members[i].sd != NULL ) pc->setpos(bgd->members[i].sd, map_index, x, y, CLR_TELEPORT); return 1; } @@ -168,14 +168,14 @@ int bg_member_respawn(struct map_session_data *sd) { return 1; // Warped } -int bg_create(unsigned short mapindex, short rx, short ry, const char *ev, const char *dev) { +int bg_create(unsigned short map_index, short rx, short ry, const char *ev, const char *dev) { struct battleground_data *bgd; bg->team_counter++; CREATE(bgd, struct battleground_data, 1); bgd->bg_id = bg->team_counter; bgd->count = 0; - bgd->mapindex = mapindex; + bgd->mapindex = map_index; bgd->x = rx; bgd->y = ry; safestrncpy(bgd->logout_event, ev, sizeof(bgd->logout_event)); |