summaryrefslogtreecommitdiff
path: root/src/map/script.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/script.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/script.c')
-rw-r--r--src/map/script.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 65dcba2f9..51f18dfb6 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -16385,10 +16385,10 @@ BUILDIN(rid2name) {
switch(bl->type) {
case BL_MOB: script_pushstrcopy(st, ((struct mob_data *)bl)->name); break;
case BL_PC: script_pushstrcopy(st, ((struct map_session_data *)bl)->status.name); break;
- case BL_NPC: script_pushstrcopy(st,((TBL_NPC*)bl)->exname); break;
+ case BL_NPC: script_pushstrcopy(st, ((struct npc_data *)bl)->exname); break;
case BL_PET: script_pushstrcopy(st,((TBL_PET*)bl)->pet.name); break;
case BL_HOM: script_pushstrcopy(st, ((struct homun_data *)bl)->homunculus.name); break;
- case BL_MER: script_pushstrcopy(st,((TBL_MER*)bl)->db->name); break;
+ case BL_MER: script_pushstrcopy(st, ((struct mercenary_data *)bl)->db->name); break;
default:
ShowError("buildin_rid2name: BL type unknown.\n");
script_pushconststr(st,"");