diff options
| author | shennetsind <ind@henn.et> | 2015-01-24 13:13:30 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2015-01-24 13:13:30 -0200 |
| commit | 1f40b88a9b27f1437d2d8b2f4c5dcb56a1e477db (patch) | |
| tree | c42ecbcccc60f0bab2a72d5a2ae40a37bc7b5630 /src/map/map.h | |
| parent | 6f3a82487fdffabf221a9a2dfc5ace027c333f95 (diff) | |
| download | hercules-1f40b88a9b27f1437d2d8b2f4c5dcb56a1e477db.tar.gz hercules-1f40b88a9b27f1437d2d8b2f4c5dcb56a1e477db.tar.bz2 hercules-1f40b88a9b27f1437d2d8b2f4c5dcb56a1e477db.tar.xz hercules-1f40b88a9b27f1437d2d8b2f4c5dcb56a1e477db.zip | |
Fixed Bug 8395
Adjusted zone merging logic to not merge items the main zone originally intended to enable (i.e. normal zone disables Velum_Jamadhar, gvg zone sets Velum_Jamadhar: false)
Special Thanks to Ancyker, Michieru
http://hercules.ws/board/tracker/issue-8395-map-zone-db-stacking-incorrectly-siege-gears-not-working/
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/map.h b/src/map/map.h index 9fca3e606..da69bacee 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -560,6 +560,8 @@ struct map_zone_data { int disabled_skills_count; int *disabled_items; int disabled_items_count; + int *cant_disable_items; /** when a zone wants to ensure such a item is never disabled (i.e. gvg zone enables a item that is restricted everywhere else) **/ + int cant_disable_items_count; char **mapflags; int mapflags_count; struct map_zone_disabled_command_entry **disabled_commands; @@ -1079,6 +1081,7 @@ struct map_interface { void (*add_questinfo) (int m, struct questinfo *qi); bool (*remove_questinfo) (int m, struct npc_data *nd); struct map_zone_data *(*merge_zone) (struct map_zone_data *main, struct map_zone_data *other); + void (*zone_clear_single) (struct map_zone_data *zone); }; struct map_interface *map; |