summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgumi <git@gumi.ca>2018-03-04 17:33:20 -0500
committergumi <git@gumi.ca>2018-03-04 17:33:20 -0500
commitd4367528821a1038812c3a7d86544c8ce5ba0b1a (patch)
treedc3384c239b209c276529dc34238274e1ec35190
parent821a51521b537dc8b95d97a578321f68a3b9e26b (diff)
downloadtmwa-d4367528821a1038812c3a7d86544c8ce5ba0b1a.tar.gz
tmwa-d4367528821a1038812c3a7d86544c8ce5ba0b1a.tar.bz2
tmwa-d4367528821a1038812c3a7d86544c8ce5ba0b1a.tar.xz
tmwa-d4367528821a1038812c3a7d86544c8ce5ba0b1a.zip
ignore phony npc event calls (~)
-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 3388ea1..0708fc0 100644
--- a/src/map/npc.cpp
+++ b/src/map/npc.cpp
@@ -566,6 +566,9 @@ int npc_event(dumb_ptr<map_session_data> sd, NpcEvent eventname,
return npc_event_doall_l(eventname.label, sd->bl_id, args); // XXX maybe merge this into npc_event?
}
+ if (eventname.npc.front() == '~')
+ return 0; // phony event (used mostly to uniquely identify mob spawns)
+
Option<P<struct event_data>> ev_ = ev_db.search(eventname);
dumb_ptr<npc_data_script> nd;