summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-09-01 22:19:18 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-09-01 22:19:18 +0000
commitc9181667d0cea7e6cfe99745d18c760c4a797912 (patch)
tree78f32c3f99a5e11ff7ee4b3af70035f0e5235e6b /src/map/script.c
parentde683beed6af67c57efd4b762a9797f98d4e28c6 (diff)
downloadhercules-c9181667d0cea7e6cfe99745d18c760c4a797912.tar.gz
hercules-c9181667d0cea7e6cfe99745d18c760c4a797912.tar.bz2
hercules-c9181667d0cea7e6cfe99745d18c760c4a797912.tar.xz
hercules-c9181667d0cea7e6cfe99745d18c760c4a797912.zip
- More code for mercenaries and starting work on restrictions.
* Heal and Sanctuary skills have their effectiveness on mercenaries reduced by 50%. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13183 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 8897c4082..d2a77036b 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -12223,6 +12223,7 @@ BUILDIN_FUNC(rid2name)
case BL_NPC: script_pushstrcopy(st,((TBL_NPC*)bl)->exname); break;
case BL_PET: script_pushstrcopy(st,((TBL_PET*)bl)->pet.name); break;
case BL_HOM: script_pushstrcopy(st,((TBL_HOM*)bl)->homunculus.name); break;
+ case BL_MER: script_pushstrcopy(st,((TBL_MER*)bl)->db->name); break;
default:
ShowError("buildin_rid2name: BL type unknown.\n");
script_pushconststr(st,"");