summaryrefslogtreecommitdiff
path: root/src/map/clif.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/clif.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/clif.c')
-rw-r--r--src/map/clif.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 5e078b5c9..af5af4e8c 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -4197,7 +4197,7 @@ void clif_getareachar_unit(struct map_session_data* sd,struct block_list *bl) {
}
break;
case BL_MER: // Devotion Effects
- if( ((TBL_MER*)bl)->devotion_flag )
+ if (((struct mercenary_data *)bl)->devotion_flag)
clif->devotion(bl, sd);
break;
case BL_NPC:
@@ -8412,7 +8412,7 @@ void clif_charnameack (int fd, struct block_list *bl)
memcpy(WBUFP(buf,6), ((struct homun_data *)bl)->homunculus.name, NAME_LENGTH);
break;
case BL_MER:
- memcpy(WBUFP(buf,6), ((TBL_MER*)bl)->db->name, NAME_LENGTH);
+ memcpy(WBUFP(buf,6), ((struct mercenary_data *)bl)->db->name, NAME_LENGTH);
break;
case BL_PET:
memcpy(WBUFP(buf,6), ((TBL_PET*)bl)->pet.name, NAME_LENGTH);