diff options
| author | shennetsind <ind@henn.et> | 2014-02-03 14:09:58 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-02-03 14:09:58 -0200 |
| commit | 50bc76c412b6618d90fdbdb24d43da2bda0525a2 (patch) | |
| tree | a98a1b4cd9aaa335b3361f2ef5cd7081b7469df2 /src/map/map.h | |
| parent | 9132878d911cfe720eaad94ad3d4a5dd11958f99 (diff) | |
| download | hercules-50bc76c412b6618d90fdbdb24d43da2bda0525a2.tar.gz hercules-50bc76c412b6618d90fdbdb24d43da2bda0525a2.tar.bz2 hercules-50bc76c412b6618d90fdbdb24d43da2bda0525a2.tar.xz hercules-50bc76c412b6618d90fdbdb24d43da2bda0525a2.zip | |
Fixed Bug 7333
Zones are now able to merge during runtime.
Special Thanks to Haru, kyeme.
http://hercules.ws/board/tracker/issue-7333-map-zone-db/
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/map/map.h b/src/map/map.h index 8faf6388e..a4e9499b3 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -531,7 +531,7 @@ struct map_zone_skill_damage_cap_entry { enum map_zone_skill_subtype subtype; }; -#define MAP_ZONE_NAME_LENGTH 30 +#define MAP_ZONE_NAME_LENGTH 60 #define MAP_ZONE_ALL_NAME "All" #define MAP_ZONE_NORMAL_NAME "Normal" #define MAP_ZONE_PVP_NAME "PvP" @@ -552,6 +552,9 @@ struct map_zone_data { int disabled_commands_count; struct map_zone_skill_damage_cap_entry **capped_skills; int capped_skills_count; + struct { + unsigned int special : 2;/* 1: whether this is a mergeable zone; 2: whether it is a merged zone */ + } info; }; struct map_drop_list { @@ -1060,6 +1063,7 @@ struct map_interface { int (*get_new_bonus_id) (void); 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); }; struct map_interface *map; |