diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2013-01-17 22:23:33 +0800 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2013-01-17 22:23:33 +0800 |
| commit | 2bf913eebcc0a18057c9012be187585a7afb2f72 (patch) | |
| tree | c6331085709e12e4fe58a915b05ed648924b4759 /src/map/script.c | |
| parent | 541c5f69913da208356ef68f556d3cb888d01911 (diff) | |
| parent | 32ea0d89b449710473aab78d83840d22fccfd5b4 (diff) | |
| download | hercules-2bf913eebcc0a18057c9012be187585a7afb2f72.tar.gz hercules-2bf913eebcc0a18057c9012be187585a7afb2f72.tar.bz2 hercules-2bf913eebcc0a18057c9012be187585a7afb2f72.tar.xz hercules-2bf913eebcc0a18057c9012be187585a7afb2f72.zip | |
Merge remote-tracking branch 'origin/rathena'
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/map/script.c b/src/map/script.c index a918bc853..4099820f1 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -7414,7 +7414,7 @@ BUILDIN_FUNC(getequipname) i = pc_checkequip(sd,equip[num]); if( i < 0 ) { - script_pushint(st,-1); + script_pushconststr(st,""); return 0; } @@ -12911,6 +12911,11 @@ BUILDIN_FUNC(npcwalkto) y=script_getnum(st,3); if(nd) { + if (!nd->status.hp) { + status_calc_npc(nd, true); + } else { + status_calc_npc(nd, false); + } unit_walktoxy(&nd->bl,x,y,0); } |