From 9d55200e778ab9c98f051948083e4d7a4034a015 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 27 Sep 2015 18:49:48 +0300
Subject: Allow setnpcsex works only with two parameters.

---
 src/emap/init.c   |  2 +-
 src/emap/script.c | 20 --------------------
 2 files changed, 1 insertion(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/emap/init.c b/src/emap/init.c
index 624a7b8..17b1841 100644
--- a/src/emap/init.c
+++ b/src/emap/init.c
@@ -104,7 +104,7 @@ HPExport void plugin_init (void)
     addScriptCommand("addmapmask", "si", addMapMask);
     addScriptCommand("removemapmask", "si", removeMapMask);
     addScriptCommand("getmapmask", "s", getMapMask);
-    addScriptCommand("setnpcsex", "*", setNpcSex);
+    addScriptCommand("setnpcsex", "si", setNpcSex);
     addScriptCommand("showavatar", "*", showAvatar);
     addScriptCommand("setavatardir", "i", setAvatarDir);
     addScriptCommand("setavataraction", "i", setAvatarAction);
diff --git a/src/emap/script.c b/src/emap/script.c
index 56c22b8..39b3d87 100644
--- a/src/emap/script.c
+++ b/src/emap/script.c
@@ -916,26 +916,6 @@ BUILDIN(setNpcSex)
         nd = npc->name2id (script_getstr(st, 2));
         sex = script_getnum(st, 3);
     }
-    else if (script_hasdata(st, 2))
-    {
-        sex = script_getnum(st, 2);
-    }
-    else
-    {
-        ShowWarning("no parameters provided\n");
-        script->reportsrc(st);
-        return false;
-    }
-
-    if (!nd && !st->oid)
-    {
-        ShowWarning("npc not found\n");
-        script->reportsrc(st);
-        return false;
-    }
-
-    if (!nd)
-        nd = (TBL_NPC *) map->id2bl(st->oid);
 
     if (!nd || !nd->vd)
     {
-- 
cgit v1.2.3-70-g09d2