diff options
| author | hemagx <hemagx2@gmail.com> | 2015-12-26 11:17:14 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-01-06 15:09:54 +0100 |
| commit | 00c95f652e5a2c572b9f210507e346af031c6f96 (patch) | |
| tree | aeaef59669cf66ac232982b6c0b62d7b6436d077 /src/map/battleground.c | |
| parent | 3364658237805c34ebc074d52d34f540c8a8ee56 (diff) | |
| download | hercules-00c95f652e5a2c572b9f210507e346af031c6f96.tar.gz hercules-00c95f652e5a2c572b9f210507e346af031c6f96.tar.bz2 hercules-00c95f652e5a2c572b9f210507e346af031c6f96.tar.xz hercules-00c95f652e5a2c572b9f210507e346af031c6f96.zip | |
Change all TBL_MER to struct mercenary_data as per style guidelines
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/battleground.c')
| -rw-r--r-- | src/map/battleground.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battleground.c b/src/map/battleground.c index 7ac18daf8..e740a3370 100644 --- a/src/map/battleground.c +++ b/src/map/battleground.c @@ -238,8 +238,8 @@ int bg_team_get_id(struct block_list *bl) { return ((struct homun_data*)bl)->master->bg_id; break; case BL_MER: - if( ((TBL_MER*)bl)->master ) - return ((TBL_MER*)bl)->master->bg_id; + if (((struct mercenary_data *)bl)->master != NULL) + return ((struct mercenary_data *)bl)->master->bg_id; break; case BL_SKILL: return ((TBL_SKILL*)bl)->group->bg_id; |