Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Merged changes up to eAthena 15085.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15819 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
eathenabot
2012-03-31 22:52:58 +00:00
parent ea46e779c0
commit cbce9ab414
2 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/map/script.c
View File

@@ -6358,18 +6358,29 @@ BUILDIN_FUNC(getcharid)
*------------------------------------------*/
BUILDIN_FUNC(getnpcid)
{
int num;
switch (num = script_getnum(st,2)) {
int num = script_getnum(st,2);
struct npc_data* nd;
if( script_hasdata(st,3) )
{// unique npc name
if( ( nd = npc_name2id(script_getstr(st,3)) ) == NULL )
{
ShowError("buildin_getnpcid: No such NPC '%s'.\n", script_getstr(st,3));
script_pushint(st,0);
return 1;
}
}
switch (num) {
case 0:
script_pushint(st,st->oid);
script_pushint(st,nd ? nd->bl.id : st->oid);
break;
default:
ShowError("buildin_getnpcid: invalid parameter (%d).\n", num);
script_pushint(st,0);
break;
return 1;
}
return 0;
}
/*==========================================
@@ -15932,7 +15943,7 @@ struct script_function buildin_func[] = {
BUILDIN_DEF(checkweight,"vi"),
BUILDIN_DEF(readparam,"i?"),
BUILDIN_DEF(getcharid,"i?"),
BUILDIN_DEF(getnpcid,"i"),
BUILDIN_DEF(getnpcid,"i?"),
BUILDIN_DEF(getpartyname,"i"),
BUILDIN_DEF(getpartymember,"i?"),
BUILDIN_DEF(getpartyleader,"i?"),