From 6386c30dc06a5fdf739ed26abe4c706a8eddb62e Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@gmail.com>
Date: Sun, 5 Apr 2015 17:42:57 -0400
Subject: remove deprecated cmdothernpc
---
src/map/npc.cpp | 21 ---------------------
src/map/npc.hpp | 1 -
src/map/script-fun.cpp | 10 ----------
3 files changed, 32 deletions(-)
diff --git a/src/map/npc.cpp b/src/map/npc.cpp
index 3320039..56c33cc 100644
--- a/src/map/npc.cpp
+++ b/src/map/npc.cpp
@@ -482,27 +482,6 @@ int npc_event(dumb_ptr<map_session_data> sd, NpcEvent eventname,
return 0;
}
-static
-void npc_command_sub(NpcEvent key, struct event_data *ev, NpcName npcname, XString command)
-{
- if (ev->nd->name == npcname
- && key.label.startswith("OnCommand"_s))
- {
- XString temp = key.label.xslice_t(9);
-
- if (command == temp)
- run_script(ScriptPointer(borrow(*ev->nd->scr.script), ev->pos), BlockId(), ev->nd->bl_id);
- }
-}
-
-int npc_command(dumb_ptr<map_session_data>, NpcName npcname, XString command)
-{
- for (auto& pair : ev_db)
- npc_command_sub(pair.first, &pair.second, npcname, command);
-
- return 0;
-}
-
/*==========================================
* 接触型のNPC処理
*------------------------------------------
diff --git a/src/map/npc.hpp b/src/map/npc.hpp
index c856a8c..a1e67e9 100644
--- a/src/map/npc.hpp
+++ b/src/map/npc.hpp
@@ -46,7 +46,6 @@ constexpr Species INVISIBLE_CLASS = wrap<Species>(32767);
int npc_event_dequeue(dumb_ptr<map_session_data> sd);
int npc_event(dumb_ptr<map_session_data> sd, NpcEvent npcname, int);
-int npc_command(dumb_ptr<map_session_data> sd, NpcName npcname, XString command);
int npc_touch_areanpc(dumb_ptr<map_session_data>, Borrowed<map_local>, int, int);
int npc_click(dumb_ptr<map_session_data>, BlockId);
int npc_scriptcont(dumb_ptr<map_session_data>, BlockId);
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp
index 8c25266..6798a74 100644
--- a/src/map/script-fun.cpp
+++ b/src/map/script-fun.cpp
@@ -2213,15 +2213,6 @@ void builtin_mapwarp(ScriptState *st) // Added by RoVeRT
BL::PC);
}
-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)
{
@@ -3080,7 +3071,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'),
--
cgit v1.2.3-70-g09d2