Jelajahi Sumber

Fixed @loadnpc not updating the script_event[] array

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9850 54d463be-8e91-2dee-dedb-b68131a5f0ec
ultramage 18 tahun lalu
induk
melakukan
06074c6046
4 mengubah file dengan 6 tambahan dan 1 penghapusan
  1. 2 0
      Changelog-Trunk.txt
  2. 2 0
      src/map/atcommand.c
  3. 1 1
      src/map/npc.c
  4. 1 0
      src/map/npc.h

+ 2 - 0
Changelog-Trunk.txt

@@ -3,6 +3,8 @@ 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.
 
+2007/02/11
+	* Fixed @loadnpc not updating the script_event[] array
 2007/02/10
 	* Fixed clif_party_message using an incorrect buffer length [ultramage]
 	* Cosmetic changes to the buildin section of script.c (use defines for 

+ 2 - 0
src/map/atcommand.c

@@ -27,6 +27,7 @@
 #include "status.h"
 #include "skill.h"
 #include "mob.h"
+#include "npc.h"
 #include "pet.h"
 #include "mercenary.h" //[orn]
 #include "battle.h"
@@ -5968,6 +5969,7 @@ int atcommand_loadnpc(const int fd, struct map_session_data* sd, const char* com
 	// add to list of script sources and run it
 	npc_addsrcfile((char *)message);
 	npc_parsesrcfile((char *)message);
+	npc_read_event_script();
 
 	clif_displaymessage(fd, msg_txt(262));
 

+ 1 - 1
src/map/npc.c

@@ -2825,7 +2825,7 @@ static int npc_read_event_script_sub(DBKey key,void *data,va_list ap)
 	return 0;
 }
 
-static void npc_read_event_script(void)
+void npc_read_event_script(void)
 {
 	int i;
 	unsigned char buf[64]="::";

+ 1 - 0
src/map/npc.h

@@ -81,6 +81,7 @@ int npc_remove_map(struct npc_data *nd);
 void npc_unload_duplicates (struct npc_data *nd);
 int npc_unload(struct npc_data *nd);
 int npc_reload(void);
+void npc_read_event_script(void);
 int npc_script_event(TBL_PC* sd, int type);
 
 extern char *current_file;