summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorhemagx <hemagx2@gmail.com>2015-12-26 11:17:14 +0200
committerHaru <haru@dotalux.com>2016-01-06 15:09:56 +0100
commit1f71f41ee0fdf23680b40ba3d5bd63629e87c3e2 (patch)
treecb549e2f60e2aa6ed8db7751d862162e9ef4678a /src/map/battle.c
parent829ebdd1527a7a4a585056463f8871d926698e2d (diff)
downloadhercules-1f71f41ee0fdf23680b40ba3d5bd63629e87c3e2.tar.gz
hercules-1f71f41ee0fdf23680b40ba3d5bd63629e87c3e2.tar.bz2
hercules-1f71f41ee0fdf23680b40ba3d5bd63629e87c3e2.tar.xz
hercules-1f71f41ee0fdf23680b40ba3d5bd63629e87c3e2.zip
Change all TBL_ELEM to struct elemental_data as per style guidelines
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 59369f6a9..d6328c951 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -6405,8 +6405,8 @@ struct block_list* battle_get_master(struct block_list *src) {
src = (struct block_list *)((struct mercenary_data *)src)->master;
break;
case BL_ELEM:
- if (((TBL_ELEM*)src)->master)
- src = (struct block_list*)((TBL_ELEM*)src)->master;
+ if (((struct elemental_data *)src)->master != NULL)
+ src = (struct block_list *)((struct elemental_data *)src)->master;
break;
case BL_SKILL:
if (((struct skill_unit *)src)->group != NULL && ((struct skill_unit *)src)->group->src_id != 0)