From b226c685421a78ddb8b7d3c29ec693fd9688e7db Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 30 Jan 2016 23:02:11 +0300
Subject: Simplify npctalk3 script command.

---
 src/emap/script.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/emap/script.c')

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)
     {
-- 
cgit v1.2.3-60-g2f50