HPM: Npc.c Interface

Fully Interfaced.
Special Thanks to Haruna

Signed-off-by: shennetsind <ind@henn.et>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/map/guild.c b/src/map/guild.c
index 37335f9d0..6219fc770 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -429,7 +429,7 @@ int guild_npc_request_info(int guild_id,const char *event)
 	if( guild->search(guild_id) )
 	{
 		if( event && *event )
-			npc_event_do(event);
+			npc->event_do(event);
 
 		return 0;
 	}
@@ -622,7 +622,7 @@ int guild_recv_info(struct guild *sg) {
 	if (guild_infoevent_db->remove(guild_infoevent_db, DB->i2key(sg->guild_id), &data)) {
 		struct eventlist *ev = DB->data2ptr(&data), *ev2;
 		while(ev) {
-			npc_event_do(ev->name);
+			npc->event_do(ev->name);
 			ev2=ev->next;
 			aFree(ev);
 			ev=ev2;
@@ -1736,7 +1736,7 @@ int castle_guild_broken_sub(DBKey key, DBData *data, va_list ap)
 		// We call castle_event::OnGuildBreak of all castles of the guild
 		// You can set all castle_events in the 'db/castle_db.txt'
 		safestrncpy(name, gc->castle_event, sizeof(name));
-		npc_event_do(strcat(name, "::OnGuildBreak"));
+		npc->event_do(strcat(name, "::OnGuildBreak"));
 
 		//Save the new 'owner', this should invoke guardian clean up and other such things.
 		guild->castledatasave(gc->castle_id, 1, 0);
@@ -2044,8 +2044,8 @@ int guild_castledataloadack(int len, struct guild_castle *gc)
 	ev = i; // offset of castle or -1
 
 	if( ev < 0 ) { //No castles owned, invoke OnAgitInit as it is.
-		npc_event_doall("OnAgitInit");
-		npc_event_doall("OnAgitInit2");
+		npc->event_doall("OnAgitInit");
+		npc->event_doall("OnAgitInit2");
 	} else { // load received castles into memory, one by one
 		for( i = 0; i < n; i++, gc++ ) {
 			struct guild_castle *c = guild->castle_search(gc->castle_id);
@@ -2076,7 +2076,7 @@ int guild_castledataloadack(int len, struct guild_castle *gc)
  *---------------------------------------------------*/
 void guild_agit_start(void)
 {	// Run All NPC_Event[OnAgitStart]
-	int c = npc_event_doall("OnAgitStart");
+	int c = npc->event_doall("OnAgitStart");
 	ShowStatus("NPC_Event:[OnAgitStart] Run (%d) Events by @AgitStart.\n",c);
 }
 
@@ -2085,7 +2085,7 @@ void guild_agit_start(void)
  *---------------------------------------------------*/
 void guild_agit_end(void)
 {	// Run All NPC_Event[OnAgitEnd]
-	int c = npc_event_doall("OnAgitEnd");
+	int c = npc->event_doall("OnAgitEnd");
 	ShowStatus("NPC_Event:[OnAgitEnd] Run (%d) Events by @AgitEnd.\n",c);
 }
 
@@ -2094,7 +2094,7 @@ void guild_agit_end(void)
  *---------------------------------------------------*/
 void guild_agit2_start(void)
 {	// Run All NPC_Event[OnAgitStart2]
-	int c = npc_event_doall("OnAgitStart2");
+	int c = npc->event_doall("OnAgitStart2");
 	ShowStatus("NPC_Event:[OnAgitStart2] Run (%d) Events by @AgitStart2.\n",c);
 }
 
@@ -2103,7 +2103,7 @@ void guild_agit2_start(void)
  *---------------------------------------------------*/
 void guild_agit2_end(void)
 {	// Run All NPC_Event[OnAgitEnd2]
-	int c = npc_event_doall("OnAgitEnd2");
+	int c = npc->event_doall("OnAgitEnd2");
 	ShowStatus("NPC_Event:[OnAgitEnd2] Run (%d) Events by @AgitEnd2.\n",c);
 }