From cbc5fbb5c063bfb64c2086a0e965adc60669cbdf Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 17 Dec 2014 12:26:46 +0300 Subject: Remove script function getnpcclass because it already in upstream. --- src/map/init.c | 1 - src/map/script.c | 28 ---------------------------- src/map/script.h | 1 - 3 files changed, 30 deletions(-) (limited to 'src') diff --git a/src/map/init.c b/src/map/init.c index 67a36dc..d84ed66 100644 --- a/src/map/init.c +++ b/src/map/init.c @@ -83,7 +83,6 @@ HPExport void plugin_init (void) addScriptCommand("addmapmask", "si", addMapMask); addScriptCommand("removemapmask", "si", removeMapMask); addScriptCommand("getmapmask", "s", getMapMask); - addScriptCommand("getnpcclass", "*", getNpcClass); addScriptCommand("setnpcsex", "*", setNpcSex); addScriptCommand("showavatar", "*", showAvatar); addScriptCommand("setavatardir", "i", setAvatarDir); diff --git a/src/map/script.c b/src/map/script.c index 9665773..97e973d 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -600,34 +600,6 @@ BUILDIN(removeMapMask) return true; } -BUILDIN(getNpcClass) -{ - struct npc_data *nd = 0; - - if (script_hasdata(st, 2)) - { - nd = npc->name2id (script_getstr(st, 2)); - } - if (!nd && !st->oid) - { - script_pushint(st, -1); - return false; - } - - if (!nd) - nd = (struct npc_data *) map->id2bl(st->oid); - - if (!nd) - { - script_pushint(st, -1); - return false; - } - - script_pushint(st, (int)nd->class_); - - return true; -} - BUILDIN(setNpcSex) { struct npc_data *nd = NULL; diff --git a/src/map/script.h b/src/map/script.h index 4c604a9..988b57c 100644 --- a/src/map/script.h +++ b/src/map/script.h @@ -27,7 +27,6 @@ BUILDIN(setMapMask); BUILDIN(getMapMask); BUILDIN(addMapMask); BUILDIN(removeMapMask); -BUILDIN(getNpcClass); BUILDIN(setNpcSex); BUILDIN(showAvatar); BUILDIN(setAvatarDir); -- cgit v1.2.3-70-g09d2