* Fixed fake_nd not being exported correctly and being unloaded when reloading scripts. (probably fixes bugreport:444)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11816 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
@@ -33,6 +33,8 @@
|
||||
#include <time.h>
|
||||
|
||||
|
||||
struct npc_data* fake_nd;
|
||||
|
||||
// linked list of npc source files
|
||||
struct npc_src_list {
|
||||
struct npc_src_list* next;
|
||||
@@ -2783,7 +2785,8 @@ static int npc_cleanup_dbsub(DBKey key, void* data, va_list ap)
|
||||
|
||||
switch(bl->type) {
|
||||
case BL_NPC:
|
||||
npc_unload((struct npc_data *)bl);
|
||||
if( bl->id != fake_nd->bl.id )// don't remove fake_nd
|
||||
npc_unload((struct npc_data *)bl);
|
||||
break;
|
||||
case BL_MOB:
|
||||
unit_free(bl,0);
|
||||
|
||||
@@ -90,6 +90,6 @@ int npc_reload(void);
|
||||
void npc_read_event_script(void);
|
||||
int npc_script_event(struct map_session_data* sd, int type);
|
||||
|
||||
struct npc_data *fake_nd;
|
||||
extern struct npc_data* fake_nd;
|
||||
|
||||
#endif /* _NPC_H_ */
|
||||
|
||||
Reference in New Issue
Block a user