- 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, 3 insertions, 14 deletions

diff --git a/src/map/mob.c b/src/map/mob.c
index 5e6c5765a..cc9b95083 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2119,21 +2119,10 @@ int mob_damage(struct block_list *src,struct mob_data *md,int damage,int type)
 		else if(mvp_sd)

 			npc_event(mvp_sd,md->npc_event,0);

 

-	} else if (mvp_sd) {

-	//lordalfa

+	} else if (mvp_sd) {	//lordalfa

 		pc_setglobalreg(mvp_sd,"killedrid",(md->class_));

-		if(mvp_sd->state.event_kill_mob){

-			if (script_config.event_script_type == 0) {

-				struct npc_data *npc;

-				if ((npc = npc_name2id(script_config.kill_mob_event_name))) {

-					run_script(npc->u.scr.script,0,mvp_sd->bl.id,npc->bl.id); // PCKillNPC [Lance]

-					ShowStatus("Event '"CL_WHITE"%s"CL_RESET"' executed.\n",script_config.kill_mob_event_name);

-				}

-			} else {

-				ShowStatus("%d '"CL_WHITE"%s"CL_RESET"' events executed.\n",	

-				npc_event_doall_id(script_config.kill_mob_event_name, mvp_sd->bl.id), script_config.kill_mob_event_name);

-			}

-		}

+		if(mvp_sd->state.event_kill_mob)

+			npc_script_event(mvp_sd, NPCE_KILLNPC); // PCKillNPC [Lance]

 	}

 	if(md->level) md->level=0;

 	map_freeblock_unlock();