diff options
Diffstat (limited to 'src/emap/script.c')
| -rw-r--r-- | src/emap/script.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/emap/script.c b/src/emap/script.c index d2281d6..6d879ce 100644 --- a/src/emap/script.c +++ b/src/emap/script.c @@ -441,22 +441,12 @@ BUILDIN(restoreCam) BUILDIN(npcTalk3) { - const char *str; char *msg; - TBL_NPC *nd = NULL; getSD(); - if (script_hasdata(st, 3)) - { - nd = npc->name2id (script_getstr(st, 2)); - str = script_getstr(st, 3); - } - else - { - nd = map->id2nd(st->oid); - str = script_getstr(st, 2); - } + TBL_NPC *nd = map->id2nd(st->oid); + const char *str = script_getstr(st, 2); if (!nd) { |