diff options
| author | shennetsind <ind@henn.et> | 2013-07-18 05:34:34 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-07-18 05:34:34 -0300 |
| commit | e26c9504e825abe8fe50eca28bf3b89de8e4bd9c (patch) | |
| tree | cb329c296924f8f8ff47033e90e9b528bb4bd9cf /src/map/npc.c | |
| parent | 586c0f7983f81e97ca70c57712e25d4d51453d6b (diff) | |
| download | hercules-e26c9504e825abe8fe50eca28bf3b89de8e4bd9c.tar.gz hercules-e26c9504e825abe8fe50eca28bf3b89de8e4bd9c.tar.bz2 hercules-e26c9504e825abe8fe50eca28bf3b89de8e4bd9c.tar.xz hercules-e26c9504e825abe8fe50eca28bf3b89de8e4bd9c.zip | |
Fixed Bug #7525
Item name constants conflicting with script var names will now result in a map server warning/notice and in the background map server will prioritise the script variable over the item name constant.
http://hercules.ws/board/tracker/issue-7525-set-variable-is-not-recognized-causing-freezing/
---
Also followup 586c0f7983f81e97ca70c57712e25d4d51453d6b sc_config.txt update
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 77c101f14..6aa19198f 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -3844,7 +3844,9 @@ int npc_reload(void) { "\t-'"CL_WHITE"%d"CL_RESET"' Mobs Cached\n" "\t-'"CL_WHITE"%d"CL_RESET"' Mobs Not Cached\n", npc_id - npc_new_min, npc_warp, npc_shop, npc_script, npc_mob, npc_cache_mob, npc_delay_mob); - + + itemdb->name_constants(); + for(i = 0; i < instance->instances; i++) { instance->destroy(i); } @@ -3999,6 +4001,8 @@ int do_init_npc(void) "\t-'"CL_WHITE"%d"CL_RESET"' Mobs Not Cached\n", npc_id - START_NPC_NUM, npc_warp, npc_shop, npc_script, npc_mob, npc_cache_mob, npc_delay_mob); + itemdb->name_constants(); + iMap->zone_init(); npc->motd = npc_name2id("HerculesMOTD"); /* [Ind/Hercules] */ |