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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
doc/script_commands.txt
View File

@ -2027,17 +2027,6 @@ Whatever it returns is determined by type.
--------------------------------------- ---------------------------------------
*getnpcid(<type>)
This function will return the GID of an NPC.
Type can be:
0 - The NPC that the running script is attached to.
Useful for making an NPC perform an action using script commands that require a GID (e.g. unit*)
---------------------------------------
*getarraysize(<array name>) *getarraysize(<array name>)
This function returns the number of values that are contained inside the This function returns the number of values that are contained inside the
@ -2141,6 +2130,19 @@ if( getcharid(2) == 0 ) mes "Only members of a guild are allowed here!";
--------------------------------------- ---------------------------------------
*getnpcid(<type>{,"<npc name>"});
Retrieves IDs of the currently invoked NPC. If a unique npc name is
given, IDs of that NPC are retrieved instead. Type specifies what ID
to retrieve and can be one of the following:
0 - Unit ID (GID)
If an invalid type is given or the NPC does not exist, return value
is 0.
---------------------------------------
*getchildid() *getchildid()
*getmotherid() *getmotherid()
*getfatherid() *getfatherid()

21
src/map/script.c
View File

@ -6358,16 +6358,27 @@ BUILDIN_FUNC(getcharid)
*------------------------------------------*/ *------------------------------------------*/
BUILDIN_FUNC(getnpcid) BUILDIN_FUNC(getnpcid)
{ {
int num; int num = script_getnum(st,2);
struct npc_data* nd;
switch (num = script_getnum(st,2)) { 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: case 0:
script_pushint(st,st->oid); script_pushint(st,nd ? nd->bl.id : st->oid);
break; break;
default: default:
ShowError("buildin_getnpcid: invalid parameter (%d).\n", num); ShowError("buildin_getnpcid: invalid parameter (%d).\n", num);
script_pushint(st,0); script_pushint(st,0);
break; return 1;
} }
return 0; return 0;
@ -15932,7 +15943,7 @@ struct script_function buildin_func[] = {
BUILDIN_DEF(checkweight,"vi"), BUILDIN_DEF(checkweight,"vi"),
BUILDIN_DEF(readparam,"i?"), BUILDIN_DEF(readparam,"i?"),
BUILDIN_DEF(getcharid,"i?"), BUILDIN_DEF(getcharid,"i?"),
BUILDIN_DEF(getnpcid,"i"), BUILDIN_DEF(getnpcid,"i?"),
BUILDIN_DEF(getpartyname,"i"), BUILDIN_DEF(getpartyname,"i"),
BUILDIN_DEF(getpartymember,"i?"), BUILDIN_DEF(getpartymember,"i?"),
BUILDIN_DEF(getpartyleader,"i?"), BUILDIN_DEF(getpartyleader,"i?"),