From 78c658cde4dbc59da851434e7acd4104344bf01d Mon Sep 17 00:00:00 2001 From: Lance Date: Thu, 30 Mar 2006 08:52:26 +0000 Subject: * Added execution of OnInterIfInit, OnCharIfInit and OnInterIfInitOnce on script reload. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5806 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 6 +++++- src/map/intif.h | 2 ++ src/map/npc.c | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 8bae872c0..8c5bcb3e1 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,7 +1,11 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. -IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. + +2006/03/30 + * Added execution of OnInterIfInit, OnCharIfInit and OnInterIfInitOnce on script + reload. [Lance] 2006/03/29 * Now none of the pet-menu options will have any effect when the pet's diff --git a/src/map/intif.h b/src/map/intif.h index 0d0fc563d..2306063f1 100644 --- a/src/map/intif.h +++ b/src/map/intif.h @@ -58,4 +58,6 @@ int intif_request_petdata(int account_id, int char_id, int pet_id); int intif_save_petdata(int account_id, struct s_pet *p); int intif_delete_petdata(int pet_id); +int CheckForCharServer(void); + #endif diff --git a/src/map/npc.c b/src/map/npc.c index b890a4ce6..e39d9abb6 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2611,6 +2611,12 @@ int npc_reload (void) //Execute the OnInit event for freshly loaded npcs. [Skotlex] ShowStatus("Event '"CL_WHITE"OnInit"CL_RESET"' executed with '" CL_WHITE"%d"CL_RESET"' NPCs.\n",npc_event_doall("OnInit")); + // Execute rest of the startup events if connected to char-server. [Lance] + if(!CheckForCharServer()){ + ShowStatus("Event '"CL_WHITE"OnCharIfInit"CL_RESET"' executed with '"CL_WHITE"%d"CL_RESET"' NPCs.\n", npc_event_doall("OnCharIfInit")); + ShowStatus("Event '"CL_WHITE"OnInterIfInit"CL_RESET"' executed with '"CL_WHITE"%d"CL_RESET"' NPCs.\n", npc_event_doall("OnInterIfInit")); + ShowStatus("Event '"CL_WHITE"OnInterIfInitOnce"CL_RESET"' executed with '"CL_WHITE"%d"CL_RESET"' NPCs.\n", npc_event_doall("OnInterIfInitOnce")); + } return 0; } -- cgit v1.2.3-70-g09d2