summaryrefslogtreecommitdiff
path: root/src/map/script-fun.cpp
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2015-04-13 21:11:15 -0500
committerWushin <pasekei@gmail.com>2015-04-13 21:11:15 -0500
commit5b1612cf0187ebd04a22226027c211ea7030be04 (patch)
tree4f0e3c889b55caa301e7f5e40dc7620241cd94c1 /src/map/script-fun.cpp
parent9b5e4a69abecec73c71266de8ee8feb79842aea7 (diff)
parent6386c30dc06a5fdf739ed26abe4c706a8eddb62e (diff)
downloadtmwa-5b1612cf0187ebd04a22226027c211ea7030be04.tar.gz
tmwa-5b1612cf0187ebd04a22226027c211ea7030be04.tar.bz2
tmwa-5b1612cf0187ebd04a22226027c211ea7030be04.tar.xz
tmwa-5b1612cf0187ebd04a22226027c211ea7030be04.zip
Merge pull request #46 from mekolat/cmdothernpc
remove deprecated cmdothernpc
Diffstat (limited to 'src/map/script-fun.cpp')
-rw-r--r--src/map/script-fun.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp
index 6c04616..7e01aaa 100644
--- a/src/map/script-fun.cpp
+++ b/src/map/script-fun.cpp
@@ -2214,15 +2214,6 @@ void builtin_mapwarp(ScriptState *st) // Added by RoVeRT
}
static
-void builtin_cmdothernpc(ScriptState *st) // Added by RoVeRT
-{
- NpcName npc = stringish<NpcName>(ZString(conv_str(st, &AARG(0))));
- ZString command = ZString(conv_str(st, &AARG(1)));
-
- npc_command(map_id2sd(st->rid), npc, command);
-}
-
-static
void builtin_mobcount_sub(dumb_ptr<block_list> bl, NpcEvent event, int *c)
{
if (event == bl->is_mob()->npc_event)
@@ -3105,7 +3096,6 @@ BuiltinFunction builtin_functions[] =
BUILTIN(pvpoff, "M"_s, '\0'),
BUILTIN(emotion, "i"_s, '\0'),
BUILTIN(mapwarp, "MMxy"_s, '\0'),
- BUILTIN(cmdothernpc, "ss"_s, '\0'),
BUILTIN(mobcount, "ME"_s, 'i'),
BUILTIN(marriage, "P"_s, 'i'),
BUILTIN(divorce, ""_s, 'i'),