From 67d042e748235a31e463307c8b28590c46ebb9f0 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Wed, 11 Apr 2012 07:49:25 +0000 Subject: minor improvement on NPC parse processing git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15853 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/map/npc.c b/src/map/npc.c index 6479bd9e1..a53d45dc8 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2354,18 +2354,14 @@ static const char* npc_parse_script(char* w1, char* w2, char* w3, char* w4, cons strdb_put(npcname_db, nd->exname, nd); //----------------------------------------- - // イベント用ラベルデータのエクスポート + // Loop through labels to export them as necessary for (i = 0; i < nd->u.scr.label_list_num; i++) { if (npc_event_export(nd, i)) { ShowWarning("npc_parse_script : duplicate event %s::%s (%s)\n", nd->exname, nd->u.scr.label_list[i].name, filepath); } - } - - //----------------------------------------- - // ラベルデータからタイマーイベント取り込み - for (i = 0; i < nd->u.scr.label_list_num; i++) npc_timerevent_export(nd, i); + } nd->u.scr.timerid = INVALID_TIMER; @@ -2506,20 +2502,15 @@ const char* npc_parse_duplicate(char* w1, char* w2, char* w3, char* w4, const ch if( type != SCRIPT ) return end; - //Handle labels //----------------------------------------- - // イベント用ラベルデータのエクスポート + // Loop through labels to export them as necessary for (i = 0; i < nd->u.scr.label_list_num; i++) { if (npc_event_export(nd, i)) { ShowWarning("npc_parse_duplicate : duplicate event %s::%s (%s)\n", nd->exname, nd->u.scr.label_list[i].name, filepath); } - } - - //----------------------------------------- - // ラベルデータからタイマーイベント取り込み - for (i = 0; i < nd->u.scr.label_list_num; i++) npc_timerevent_export(nd, i); + } nd->u.scr.timerid = INVALID_TIMER; -- cgit v1.2.3-60-g2f50