summaryrefslogtreecommitdiff
path: root/src/emap/script_buildins.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/emap/script_buildins.c')
-rw-r--r--src/emap/script_buildins.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/emap/script_buildins.c b/src/emap/script_buildins.c
index 28fc0e5..9fc1c90 100644
--- a/src/emap/script_buildins.c
+++ b/src/emap/script_buildins.c
@@ -1547,6 +1547,7 @@ BUILDIN(npcWalkTo)
if (nd->ud == NULL)
{
ShowWarning("buildin_npcwalkto: floating NPC don't have unit data.\n");
+ script_pushint(st, 0);
return false;
}
@@ -1559,7 +1560,7 @@ BUILDIN(npcWalkTo)
status_calc_npc(nd, SCO_NONE);
}
nd->vd.dead_sit = 0;
- script_pushint(st, unit->walktoxy(&nd->bl, x, y, 0));
+ script_pushint(st, unit->walk_toxy(&nd->bl, x, y, 0) ^ 1);
return true;
}
else
@@ -1598,14 +1599,14 @@ BUILDIN(chatJoin)
if (script_hasdata(st, 4))
{
if (script_isstringtype(st, 3))
- sd = map->nick2sd(script_getstr(st, 3));
+ sd = map->nick2sd(script_getstr(st, 3), false);
if (script_isstringtype(st, 4))
password = script_getstr(st, 4);
}
else if (script_hasdata(st, 3))
{
if (script_isstringtype(st, 3))
- sd = map->nick2sd(script_getstr(st, 3));
+ sd = map->nick2sd(script_getstr(st, 3), false);
}
else
{