summaryrefslogtreecommitdiff
path: root/src/map/npc-parse.cpp
diff options
context:
space:
mode:
authormekolat <mekolat@users.noreply.github.com>2016-03-24 14:32:09 -0400
committermekolat <mekolat@users.noreply.github.com>2016-04-15 11:47:24 -0400
commit6eb63903cd839b2c0dbf3acefceee4ba7b07b0f8 (patch)
tree811c8fc97471c8241aeae9acc3a9749a26e5fdc9 /src/map/npc-parse.cpp
parent502b3b714f0f636dac80bd600e174a173bd7028e (diff)
downloadtmwa-6eb63903cd839b2c0dbf3acefceee4ba7b07b0f8.tar.gz
tmwa-6eb63903cd839b2c0dbf3acefceee4ba7b07b0f8.tar.bz2
tmwa-6eb63903cd839b2c0dbf3acefceee4ba7b07b0f8.tar.xz
tmwa-6eb63903cd839b2c0dbf3acefceee4ba7b07b0f8.zip
remove MESSAGE npc subtype
Diffstat (limited to 'src/map/npc-parse.cpp')
-rw-r--r--src/map/npc-parse.cpp30
1 files changed, 0 insertions, 30 deletions
diff --git a/src/map/npc-parse.cpp b/src/map/npc-parse.cpp
index e30225a..164d793 100644
--- a/src/map/npc-parse.cpp
+++ b/src/map/npc-parse.cpp
@@ -99,12 +99,9 @@ void register_npc_name(dumb_ptr<npc_data> nd)
"WARP"_s,
"SHOP"_s,
"SCRIPT"_s,
- "MESSAGE"_s,
}};
if (!nd->name)
{
- if (nd->npc_subtype == NpcSubtype::MESSAGE)
- return;
PRINTF("WARNING: npc with no name:\n%s @ %s,%d,%d\n"_fmt,
types[nd->npc_subtype],
nd->bl_m->name_, nd->bl_x, nd->bl_y);
@@ -655,33 +652,6 @@ bool npc_load_script_any(ast::npc::Script *script)
abort();
}
-dumb_ptr<npc_data> npc_spawn_text(Borrowed<map_local> m, int x, int y,
- Species npc_class, NpcName name, AString message)
-{
- dumb_ptr<npc_data_message> retval;
- retval.new_();
- retval->bl_id = npc_get_new_npc_id();
- retval->bl_x = x;
- retval->bl_y = y;
- retval->bl_m = m;
- retval->bl_type = BL::NPC;
- retval->npc_subtype = NpcSubtype::MESSAGE;
-
- retval->name = name;
- if (message)
- retval->message = message;
-
- retval->npc_class = npc_class;
- retval->speed = 200_ms;
-
- clif_spawnnpc(retval);
- map_addblock(retval);
- map_addiddb(retval);
- register_npc_name(retval);
-
- return retval;
-}
-
static
bool load_one_npc(io::LineCharReader& fp, bool& done)
{