diff options
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/map.h b/src/map/map.h index 4a8be92ed..01ac74cba 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -156,9 +156,9 @@ enum { #define DEFAULT_AUTOSAVE_INTERVAL 5*60*1000 //Specifies maps where players may hit each other -#define map_flag_vs(m) (map[m].flag.pvp || map[m].flag.gvg_dungeon || map[m].flag.gvg || (agit_flag && map[m].flag.gvg_castle)) +#define map_flag_vs(m) (map[m].flag.pvp || map[m].flag.gvg_dungeon || map[m].flag.gvg || ((agit_flag || agit2_flag) && map[m].flag.gvg_castle)) //Specifies maps that have special GvG/WoE restrictions -#define map_flag_gvg(m) (map[m].flag.gvg || (agit_flag && map[m].flag.gvg_castle)) +#define map_flag_gvg(m) (map[m].flag.gvg || ((agit_flag || agit2_flag) && map[m].flag.gvg_castle)) //Specifies if the map is tagged as GvG/WoE (regardless of agit_flag status) #define map_flag_gvg2(m) (map[m].flag.gvg || map[m].flag.gvg_castle) // No Kill Steal Protection @@ -496,6 +496,7 @@ extern int autosave_interval; extern int minsave_interval; extern int save_settings; extern int agit_flag; +extern int agit2_flag; extern int night_flag; // 0=day, 1=night [Yor] extern int enable_spy; //Determines if @spy commands are active. extern char db_path[256]; |