diff options
| author | Haru <haru@dotalux.com> | 2020-02-09 21:18:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-09 21:18:26 +0100 |
| commit | 481d92bfa0fac1320aebf0ab4f4ceb8365fa3ff3 (patch) | |
| tree | 807314fa875ca53ab1508f347bcf5ad12e9f3348 /src/map/npc.h | |
| parent | 9e68350a054d5ec181a40528728d8de185a4f43c (diff) | |
| parent | d84aee4cd917fd1a151d7ec0b3a2d7e32df02441 (diff) | |
| download | hercules-481d92bfa0fac1320aebf0ab4f4ceb8365fa3ff3.tar.gz hercules-481d92bfa0fac1320aebf0ab4f4ceb8365fa3ff3.tar.bz2 hercules-481d92bfa0fac1320aebf0ab4f4ceb8365fa3ff3.tar.xz hercules-481d92bfa0fac1320aebf0ab4f4ceb8365fa3ff3.zip | |
Merge pull request #2590 from Kenpachi2k13/issue#2530
Change unload NPC behavior to kill mobs that were spawned by unloaded NPC (non-permanent monster spawns) [Issue #2530]
Diffstat (limited to 'src/map/npc.h')
| -rw-r--r-- | src/map/npc.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/npc.h b/src/map/npc.h index 392911046..65c9796d9 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -270,8 +270,9 @@ struct npc_interface { int (*unload_ev) (union DBKey key, struct DBData *data, va_list ap); int (*unload_ev_label) (union DBKey key, struct DBData *data, va_list ap); int (*unload_dup_sub) (struct npc_data *nd, va_list args); - void (*unload_duplicates) (struct npc_data *nd); - int (*unload) (struct npc_data *nd, bool single); + void (*unload_duplicates) (struct npc_data *nd, bool unload_mobs); + int (*unload_mob) (struct mob_data *md, va_list args); + int (*unload) (struct npc_data *nd, bool single, bool unload_mobs); void (*clearsrcfile) (void); void (*addsrcfile) (const char *name); void (*delsrcfile) (const char *name); @@ -313,7 +314,7 @@ struct npc_interface { int (*path_db_clear_sub) (union DBKey key, struct DBData *data, va_list args); int (*ev_label_db_clear_sub) (union DBKey key, struct DBData *data, va_list args); int (*reload) (void); - bool (*unloadfile) (const char *filepath); + bool (*unloadfile) (const char *filepath, bool unload_mobs); void (*do_clear_npc) (void); void (*debug_warps_sub) (struct npc_data *nd); void (*debug_warps) (void); |