diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-11-26 12:01:19 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-11-26 12:01:19 +0000 |
| commit | 476222257ace810a1e69d552c969f36c4687f4d9 (patch) | |
| tree | 4366787ac16e9f9d952b9cc1dee2c4e45d20e9f2 /src/map/npc.h | |
| parent | 07dee1fd6c710b78fc826679966dbb6c0c1a8d44 (diff) | |
| download | hercules-476222257ace810a1e69d552c969f36c4687f4d9.tar.gz hercules-476222257ace810a1e69d552c969f36c4687f4d9.tar.bz2 hercules-476222257ace810a1e69d552c969f36c4687f4d9.tar.xz hercules-476222257ace810a1e69d552c969f36c4687f4d9.zip | |
* NPC event code cleanups.
- removed the 'OnMyMobDead' dead code. It's never supported though documented.
- removed the 'feature' that events only trigger when the player is in the OnTouch area IF it's specified.
It's never documented and breaks official scripts.
- some cleanups and bug fixes to OnTouch_.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14173 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.h')
| -rw-r--r-- | src/map/npc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/npc.h b/src/map/npc.h index 5bbb29fa4..6f705a09c 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -98,11 +98,11 @@ enum npce_event { struct view_data* npc_get_viewdata(int class_); int npc_chat_sub(struct block_list* bl, va_list ap); int npc_event_dequeue(struct map_session_data* sd); -int npc_event(struct map_session_data* sd, const char* eventname, int mob_kill); +int npc_event(struct map_session_data* sd, const char* eventname, int ontouch); int npc_touch_areanpc(struct map_session_data* sd, int m, int x, int y); int npc_touch_areanpc2(struct mob_data *md); // [Skotlex] int npc_check_areanpc(int flag, int m, int x, int y, int range); -int npc_touchnext_areanpc(struct map_session_data* sd,bool logout); +int npc_touchnext_areanpc(struct map_session_data* sd,bool leavemap); int npc_click(struct map_session_data* sd, struct npc_data* nd); int npc_scriptcont(struct map_session_data* sd, int id); struct npc_data* npc_checknear(struct map_session_data* sd, struct block_list* bl); |