Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed @loadnpc not updating the script_event[] array

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9850 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-02-11 21:44:37 +00:00
parent 7b9539f4e3
commit 06074c6046
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. 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.
2007/02/11
* Fixed @loadnpc not updating the script_event[] array
2007/02/10 2007/02/10
* Fixed clif_party_message using an incorrect buffer length [ultramage] * Fixed clif_party_message using an incorrect buffer length [ultramage]
* Cosmetic changes to the buildin section of script.c (use defines for * Cosmetic changes to the buildin section of script.c (use defines for

2
src/map/atcommand.c
View File

@ -27,6 +27,7 @@
#include "status.h" #include "status.h"
#include "skill.h" #include "skill.h"
#include "mob.h" #include "mob.h"
#include "npc.h"
#include "pet.h" #include "pet.h"
#include "mercenary.h" //[orn] #include "mercenary.h" //[orn]
#include "battle.h" #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 // add to list of script sources and run it
npc_addsrcfile((char *)message); npc_addsrcfile((char *)message);
npc_parsesrcfile((char *)message); npc_parsesrcfile((char *)message);
npc_read_event_script();
clif_displaymessage(fd, msg_txt(262)); clif_displaymessage(fd, msg_txt(262));

2
src/map/npc.c
View File

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

1
src/map/npc.h
View File

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