summaryrefslogtreecommitdiff
path: root/src/map/npc-parse.cpp
diff options
context:
space:
mode:
authorgumi <git@gumi.ca>2018-01-01 16:09:22 -0500
committergumi <git@gumi.ca>2018-01-01 18:09:15 -0500
commitb7ec6e535d314a64aeaf426e2e4c068cd7c4bb34 (patch)
treef29e84563c80e5438da35e608967c33c195dde98 /src/map/npc-parse.cpp
parente808b814cd0899342fcba21cc74ec059772ceb5e (diff)
downloadtmwa-b7ec6e535d314a64aeaf426e2e4c068cd7c4bb34.tar.gz
tmwa-b7ec6e535d314a64aeaf426e2e4c068cd7c4bb34.tar.bz2
tmwa-b7ec6e535d314a64aeaf426e2e4c068cd7c4bb34.tar.xz
tmwa-b7ec6e535d314a64aeaf426e2e4c068cd7c4bb34.zip
release v18.1.1v18.1.1
Diffstat (limited to 'src/map/npc-parse.cpp')
-rw-r--r--src/map/npc-parse.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/map/npc-parse.cpp b/src/map/npc-parse.cpp
index 99e6267..47b851c 100644
--- a/src/map/npc-parse.cpp
+++ b/src/map/npc-parse.cpp
@@ -164,6 +164,8 @@ bool npc_load_warp(ast::npc::Warp& warp)
nd->warp.xs = xs;
nd->warp.ys = ys;
+ nd->deletion_pending = false;
+
npc_warp++;
nd->bl_type = BL::NPC;
nd->npc_subtype = NpcSubtype::WARP;
@@ -226,6 +228,8 @@ bool npc_load_shop(ast::npc::Shop& shop)
nd->opt2 = Opt2::ZERO;
nd->opt3 = Opt3::ZERO;
+ nd->deletion_pending = false;
+
npc_shop++;
nd->bl_type = BL::NPC;
nd->npc_subtype = NpcSubtype::SHOP;
@@ -454,6 +458,8 @@ bool npc_load_script_none(ast::script::ScriptBody& body, ast::npc::ScriptNone& s
nd->opt2 = Opt2::ZERO;
nd->opt3 = Opt3::ZERO;
+ nd->deletion_pending = false;
+
npc_script++;
nd->bl_type = BL::NPC;
nd->npc_subtype = NpcSubtype::SCRIPT;
@@ -562,6 +568,8 @@ bool npc_load_script_map(ast::script::ScriptBody& body, ast::npc::ScriptMap& scr
nd->opt2 = Opt2::ZERO;
nd->opt3 = Opt3::ZERO;
+ nd->deletion_pending = false;
+
npc_script++;
nd->bl_type = BL::NPC;
nd->npc_subtype = NpcSubtype::SCRIPT;