diff options
| author | Haru <haru@dotalux.com> | 2018-02-06 20:18:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 20:18:07 +0100 |
| commit | 19c94017a31d86f7848085162ffb741770975128 (patch) | |
| tree | 33a5cf4b2a580a07f1b3868153123fe4dce49f2f /src/map/map.h | |
| parent | a928f009f5a7bad77eda090ec7af551c2f647d5b (diff) | |
| parent | 587dd19c0269b3c8089838a5442260a185b19ead (diff) | |
| download | hercules-19c94017a31d86f7848085162ffb741770975128.tar.gz hercules-19c94017a31d86f7848085162ffb741770975128.tar.bz2 hercules-19c94017a31d86f7848085162ffb741770975128.tar.xz hercules-19c94017a31d86f7848085162ffb741770975128.zip | |
Merge pull request #1718 from Murilo-BiO/clan_system
Implementation of Official Clan System
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 fab8839d8..facf1d921 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -352,6 +352,7 @@ STATIC_ASSERT(((MAPID_1_1_MAX - 1) | MAPID_BASEMASK) == MAPID_BASEMASK, "First c || map->list[m].flag.gvg \ || ((map->agit_flag || map->agit2_flag) && map->list[m].flag.gvg_castle) \ || map->list[m].flag.battleground \ + || map->list[m].flag.cvc \ ) // Specifies maps that have special GvG/WoE restrictions #define map_flag_gvg(m) (map->list[m].flag.gvg || ((map->agit_flag || map->agit2_flag) && map->list[m].flag.gvg_castle)) @@ -737,6 +738,7 @@ enum map_zone_merge_type { #define MAP_ZONE_PVP_NAME "PvP" #define MAP_ZONE_GVG_NAME "GvG" #define MAP_ZONE_BG_NAME "Battlegrounds" +#define MAP_ZONE_CVC_NAME "CvC" #define MAP_ZONE_PK_NAME "PK Mode" #define MAP_ZONE_MAPFLAG_LENGTH 50 @@ -823,6 +825,7 @@ struct map_data { unsigned gvg_dungeon : 1; // Celest unsigned gvg_noparty : 1; unsigned battleground : 2; // [BattleGround System] + unsigned cvc : 1; unsigned nozenypenalty : 1; unsigned notrade : 1; unsigned noskill : 1; |