From 331dbfc20d0eb2b7061efd3c693d99eed769ba91 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Thu, 8 Dec 2022 21:32:39 -0700 Subject: [PATCH] vis: refactor output_group and advanced_group to avoid name clash with light --- include/vis/vis.hh | 24 ++++++++++++------------ vis/vis.cc | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/vis/vis.hh b/include/vis/vis.hh index ac037cb5..a768fb2e 100644 --- a/include/vis/vis.hh +++ b/include/vis/vis.hh @@ -218,27 +218,27 @@ void CleanVisState(void); namespace settings { -extern setting_group output_group; -extern setting_group advanced_group; +extern setting_group vis_output_group; +extern setting_group vis_advanced_group; class vis_settings : public common_settings { public: setting_bool fast{this, "fast", false, &performance_group, "run very simple & fast vis procedure"}; - setting_int32 level{this, "level", 4, 0, 4, &advanced_group, "number of iterations for tests"}; - setting_bool noambientsky{this, "noambientsky", false, &output_group, "don't output ambient sky sounds"}; - setting_bool noambientwater{this, "noambientwater", false, &output_group, "don't output ambient water sounds"}; - setting_bool noambientslime{this, "noambientslime", false, &output_group, "don't output ambient slime sounds"}; - setting_bool noambientlava{this, "noambientlava", false, &output_group, "don't output ambient lava sounds"}; + setting_int32 level{this, "level", 4, 0, 4, &vis_advanced_group, "number of iterations for tests"}; + setting_bool noambientsky{this, "noambientsky", false, &vis_output_group, "don't output ambient sky sounds"}; + setting_bool noambientwater{this, "noambientwater", false, &vis_output_group, "don't output ambient water sounds"}; + setting_bool noambientslime{this, "noambientslime", false, &vis_output_group, "don't output ambient slime sounds"}; + setting_bool noambientlava{this, "noambientlava", false, &vis_output_group, "don't output ambient lava sounds"}; setting_redirect noambient{this, "noambient", {&noambientsky, &noambientwater, &noambientslime, &noambientlava}, - &output_group, "don't output ambient sounds at all"}; + &vis_output_group, "don't output ambient sounds at all"}; setting_scalar visdist{ - this, "visdist", 0.0, &advanced_group, "control the distance required for a portal to be considered seen"}; - setting_bool nostate{this, "nostate", false, &advanced_group, "ignore saved state files, for forced re-runs"}; + this, "visdist", 0.0, &vis_advanced_group, "control the distance required for a portal to be considered seen"}; + setting_bool nostate{this, "nostate", false, &vis_advanced_group, "ignore saved state files, for forced re-runs"}; setting_bool phsonly{ - this, "phsonly", false, &advanced_group, "re-calculate the PHS of a Quake II BSP without touching the PVS"}; + this, "phsonly", false, &vis_advanced_group, "re-calculate the PHS of a Quake II BSP without touching the PVS"}; setting_invertible_bool autoclean{ - this, "autoclean", true, &output_group, "remove any extra files on successful completion"}; + this, "autoclean", true, &vis_output_group, "remove any extra files on successful completion"}; fs::path sourceMap; diff --git a/vis/vis.cc b/vis/vis.cc index 6243f5ce..f021167d 100644 --- a/vis/vis.cc +++ b/vis/vis.cc @@ -56,8 +56,8 @@ int leafbytes_real; // (portalleafs_real+63)>>3, not used for Q2. namespace settings { -setting_group output_group{"Output", 200}; -setting_group advanced_group{"Advanced", 300}; +setting_group vis_output_group{"Output", 200}; +setting_group vis_advanced_group{"Advanced", 300}; void vis_settings::initialize(int argc, const char **argv) {