diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2014-12-20 00:13:35 +0800 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2014-12-20 00:13:35 +0800 |
| commit | c4456ddbebccaca51ab040c60e3c586ed2cc0a10 (patch) | |
| tree | 53d3e23baab08d63d88fdc055f6880f884aac640 /src/map/npc.h | |
| parent | 772cb2b111973c0c749e505ffd2685bb67e887bd (diff) | |
| parent | 68f0fee76a73612263984da5d9de1e32b7ffe7da (diff) | |
| download | hercules-c4456ddbebccaca51ab040c60e3c586ed2cc0a10.tar.gz hercules-c4456ddbebccaca51ab040c60e3c586ed2cc0a10.tar.bz2 hercules-c4456ddbebccaca51ab040c60e3c586ed2cc0a10.tar.xz hercules-c4456ddbebccaca51ab040c60e3c586ed2cc0a10.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/npc.h')
| -rw-r--r-- | src/map/npc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/npc.h b/src/map/npc.h index fba14d485..a5a2b4676 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -61,6 +61,7 @@ struct npc_data { int touching_id; int64 next_walktime; uint8 dir; + uint8 area_size; unsigned size : 2; @@ -181,6 +182,7 @@ struct npc_interface { bool (*isnear) (struct block_list *bl); int (*ontouch_event) (struct map_session_data *sd, struct npc_data *nd); int (*ontouch2_event) (struct map_session_data *sd, struct npc_data *nd); + int (*onuntouch_event) (struct map_session_data *sd, struct npc_data *nd); int (*enable_sub) (struct block_list *bl, va_list ap); int (*enable) (const char *name, int flag); struct npc_data* (*name2id) (const char *name); @@ -205,6 +207,7 @@ struct npc_interface { int (*touch_areanpc_sub) (struct block_list *bl, va_list ap); int (*touchnext_areanpc) (struct map_session_data *sd, bool leavemap); int (*touch_areanpc) (struct map_session_data *sd, int16 m, int16 x, int16 y); + int (*untouch_areanpc) (struct map_session_data *sd, int16 m, int16 x, int16 y); int (*touch_areanpc2) (struct mob_data *md); int (*check_areanpc) (int flag, int16 m, int16 x, int16 y, int16 range); struct npc_data* (*checknear) (struct map_session_data *sd, struct block_list *bl); |