diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-11-09 19:56:50 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-11-09 19:58:49 -0800 |
| commit | 2f90b3a569c9627f0fa56ed282a33b596f0026f3 (patch) | |
| tree | ada9ce73b798b18596c3225d250087fc70f56489 /src/map/npc.cpp | |
| parent | f5db6b09fb461d7bb60ff443d603bb10820d5f14 (diff) | |
| download | tmwa-2f90b3a569c9627f0fa56ed282a33b596f0026f3.tar.gz tmwa-2f90b3a569c9627f0fa56ed282a33b596f0026f3.tar.bz2 tmwa-2f90b3a569c9627f0fa56ed282a33b596f0026f3.tar.xz tmwa-2f90b3a569c9627f0fa56ed282a33b596f0026f3.zip | |
Add explicit check for mapless events
Diffstat (limited to 'src/map/npc.cpp')
| -rw-r--r-- | src/map/npc.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/map/npc.cpp b/src/map/npc.cpp index 304224a..90ac917 100644 --- a/src/map/npc.cpp +++ b/src/map/npc.cpp @@ -465,7 +465,6 @@ int npc_event(dumb_ptr<map_session_data> sd, NpcEvent eventname, { Option<P<struct event_data>> ev_ = ev_db.search(eventname); dumb_ptr<npc_data_script> nd; - int xs, ys; if (sd == nullptr) { @@ -490,10 +489,10 @@ int npc_event(dumb_ptr<map_session_data> sd, NpcEvent eventname, return 0; } - xs = nd->scr.xs; - ys = nd->scr.ys; - if (xs >= 0 && ys >= 0) + if (nd->scr.event_needs_map) { + int xs = nd->scr.xs; + int ys = nd->scr.ys; if (nd->bl_m != sd->bl_m) return 1; if (xs > 0 |