summaryrefslogtreecommitdiff
path: root/src/map/npc.cpp
diff options
context:
space:
mode:
authormekolat <mekolat@users.noreply.github.com>2016-05-13 18:47:26 -0400
committermekolat <mekolat@users.noreply.github.com>2016-05-13 18:47:26 -0400
commitceb7acf8291867d56b53c3f696a39e91fd79da59 (patch)
treeaa8435df2ad26674878343b5e6d4531ccd17f329 /src/map/npc.cpp
parentf9df1a84b4486eefc65fb91287c2c399531e5b37 (diff)
parent67fba86142da3c188ccede6c9403afbc2cd72ea1 (diff)
downloadtmwa-ceb7acf8291867d56b53c3f696a39e91fd79da59.tar.gz
tmwa-ceb7acf8291867d56b53c3f696a39e91fd79da59.tar.bz2
tmwa-ceb7acf8291867d56b53c3f696a39e91fd79da59.tar.xz
tmwa-ceb7acf8291867d56b53c3f696a39e91fd79da59.zip
Merge pull request #225 from mekolat/destroy
fix destroynpc crash
Diffstat (limited to 'src/map/npc.cpp')
-rw-r--r--src/map/npc.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/npc.cpp b/src/map/npc.cpp
index 3eb13b3..2600117 100644
--- a/src/map/npc.cpp
+++ b/src/map/npc.cpp
@@ -1052,6 +1052,9 @@ void npc_free_internal(dumb_ptr<npc_data> nd_)
static
void npc_propagate_update(dumb_ptr<npc_data> nd)
{
+ if (nd->bl_m == borrow(undefined_gat))
+ return;
+
int xs = 0, ys = 0;
if (dumb_ptr<npc_data_script> nd_ = nd->is_script())
{