summaryrefslogtreecommitdiff
path: root/src/map/npc.cpp
diff options
context:
space:
mode:
authormekolat <mekolat@users.noreply.github.com>2015-09-10 22:30:23 -0400
committermekolat <mekolat@users.noreply.github.com>2016-04-15 11:46:39 -0400
commit4cb881c88f5e1879e89ab2c830a622a2edfb0f82 (patch)
tree6f7dcf8a338fbf4bfac846c1ce7bf31da16672ea /src/map/npc.cpp
parentf3dd34b5172f2bcb4f79d472e4c8ba2dbfe9cce0 (diff)
downloadtmwa-4cb881c88f5e1879e89ab2c830a622a2edfb0f82.tar.gz
tmwa-4cb881c88f5e1879e89ab2c830a622a2edfb0f82.tar.bz2
tmwa-4cb881c88f5e1879e89ab2c830a622a2edfb0f82.tar.xz
tmwa-4cb881c88f5e1879e89ab2c830a622a2edfb0f82.zip
do not bind trigger detection to map cells
Diffstat (limited to 'src/map/npc.cpp')
-rw-r--r--src/map/npc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/npc.cpp b/src/map/npc.cpp
index c55dbbf..b7fb9ca 100644
--- a/src/map/npc.cpp
+++ b/src/map/npc.cpp
@@ -713,12 +713,12 @@ int npc_touch_areanpc(dumb_ptr<map_session_data> sd, Borrowed<map_local> m, int
aname.label = stringish<ScriptLabel>("OnTouch"_s);
if (sd->areanpc_id == m->npc[i]->bl_id)
- return 1;
+ return 2;
sd->areanpc_id = m->npc[i]->bl_id;
if (npc_event(sd, aname, 0) > 0)
npc_click(sd, m->npc[i]->bl_id);
- break;
+ return 2;
}
}
return 0;