summaryrefslogtreecommitdiff
path: root/src/map/mob.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:54 +0100
commit00c95f652e5a2c572b9f210507e346af031c6f96 (patch)
treeaeaef59669cf66ac232982b6c0b62d7b6436d077 /src/map/mob.c
parent3364658237805c34ebc074d52d34f540c8a8ee56 (diff)
downloadhercules-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/mob.c')
-rw-r--r--src/map/mob.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/mob.c b/src/map/mob.c
index 2c7f3a585..311e1049d 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1963,7 +1963,7 @@ void mob_log_damage(struct mob_data *md, struct block_list *src, int damage)
}
case BL_MER:
{
- struct mercenary_data *mer = (TBL_MER*)src;
+ struct mercenary_data *mer = (struct mercenary_data *)src;
if( mer->master )
char_id = mer->master->status.char_id;
if( damage )
@@ -2584,7 +2584,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) {
switch( src->type ) {
case BL_PET: sd = ((TBL_PET*)src)->msd; break;
case BL_HOM: sd = ((struct homun_data *)src)->master; break;
- case BL_MER: sd = ((TBL_MER*)src)->master; break;
+ case BL_MER: sd = ((struct mercenary_data *)src)->master; break;
case BL_ELEM: sd = ((TBL_ELEM*)src)->master; break;
}
}