- Added a npc-script-event cache to avoid looking up event-scripts every time they need to be executed. Events cached are all those defined in script_config.

- Since the cache holds direct pointers to the npcs/events, do NOT unload the related NPCs or you'll get dangling pointers. However, @reloadscript will work fine.
- Set the etc_log to on to see a summary of npcs/events loaded for script execution on startup.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6494 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 13 insertions, 0 deletions

diff --git a/src/map/npc.h b/src/map/npc.h
index 2ee4999c6..035c6ecf8 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -20,6 +20,18 @@ void npc_chat_finalize(struct npc_data *nd);
 int mob_chat_sub(struct block_list *bl, va_list ap);

 #endif

 

+//Script NPC events.

+enum {

+	NPCE_LOGIN,

+	NPCE_LOGOUT,

+	NPCE_LOADMAP,

+	NPCE_BASELVUP,

+	NPCE_JOBLVUP,

+	NPCE_DIE,

+	NPCE_KILLPC,

+	NPCE_KILLNPC,

+	NPCE_MAX

+};

 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);

@@ -65,6 +77,7 @@ int npc_settimerevent_tick(struct npc_data *nd,int newtimer);
 int npc_remove_map(struct npc_data *nd);

 int npc_unload(struct npc_data *nd);

 int npc_reload(void);

+int npc_script_event(TBL_PC* sd, int type);

 

 extern int dummy_npc_id;