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

- Cleanups and a little fix to NPC Sizes (thanks to ultramage).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12745 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
zephyrus 2008-05-30 12:01:59 +00:00
parent 2da8086509
commit b37569c083
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/map/script.c
View File

@ -11662,26 +11662,17 @@ BUILDIN_FUNC(setnpcdisplay)
name = script_getstr(st,2); name = script_getstr(st,2);
data = script_getdata(st,3); data = script_getdata(st,3);
get_val(st, data);
if( script_hasdata(st,5) ) if( script_hasdata(st,5) )
{
newname = conv_str(st,data);
class_ = script_getnum(st,4);
size = script_getnum(st,5); size = script_getnum(st,5);
}
if( script_hasdata(st,4) ) if( script_hasdata(st,4) )
{
newname = conv_str(st,data);
class_ = script_getnum(st,4); class_ = script_getnum(st,4);
}
else if( data_isstring(data) ) get_val(st, data);
{ if( data_isstring(data) )
newname = conv_str(st,data); newname = conv_str(st,data);
}
else if( data_isint(data) ) else if( data_isint(data) )
{ class_ = conv_num(st,data);
class_ = conv_num(st,data);
}
else else
{ {
ShowError("script:setnpcdisplay: expected a string or number\n"); ShowError("script:setnpcdisplay: expected a string or number\n");
@ -11705,7 +11696,7 @@ BUILDIN_FUNC(setnpcdisplay)
else else
size = -1; size = -1;
if( class_ != -1 && nd->class_ == class_ ) if( class_ != -1 && nd->class_ != class_ )
npc_setclass(nd, class_); npc_setclass(nd, class_);
else if( size != -1 ) else if( size != -1 )
{ // Required to update the visual size { // Required to update the visual size