diff --git a/include/light/light.hh b/include/light/light.hh index 7e7dee9d..47c9df69 100644 --- a/include/light/light.hh +++ b/include/light/light.hh @@ -445,7 +445,7 @@ extern std::vector extended_texinfo_flags; // public functions -void FixupGlobalSettings(void); +void FixupGlobalSettings(); void GetFileSpace(uint8_t **lightdata, uint8_t **colordata, uint8_t **deluxdata, int size); void GetFileSpace_PreserveOffsetInBsp(uint8_t **lightdata, uint8_t **colordata, uint8_t **deluxdata, int lightofs); const modelinfo_t *ModelInfoForModel(const mbsp_t *bsp, int modelnum); diff --git a/include/qbsp/map.hh b/include/qbsp/map.hh index 42677964..2dec389a 100644 --- a/include/qbsp/map.hh +++ b/include/qbsp/map.hh @@ -276,7 +276,7 @@ struct mapdata_t extern mapdata_t map; -void CalculateWorldExtent(void); +void CalculateWorldExtent(); struct texture_def_issues_t : logging::stat_tracker_t { @@ -308,8 +308,8 @@ void ProcessExternalMapEntity(mapentity_t &entity); void ProcessAreaPortal(mapentity_t &entity); bool IsWorldBrushEntity(const mapentity_t &entity); bool IsNonRemoveWorldBrushEntity(const mapentity_t &entity); -void LoadMapFile(void); -void ConvertMapFile(void); +void LoadMapFile(); +void ConvertMapFile(); void ProcessMapBrushes(); struct quark_tx_info_t diff --git a/include/qbsp/writebsp.hh b/include/qbsp/writebsp.hh index d93d0ff9..01a4cca0 100644 --- a/include/qbsp/writebsp.hh +++ b/include/qbsp/writebsp.hh @@ -24,6 +24,6 @@ size_t ExportMapTexinfo(size_t texinfonum); size_t ExportMapPlane(size_t planenum); -void BeginBSPFile(void); -void FinishBSPFile(void); +void BeginBSPFile(); +void FinishBSPFile(); void UpdateBSPFileEntitiesLump(); diff --git a/include/vis/vis.hh b/include/vis/vis.hh index 84e444cf..a340acf5 100644 --- a/include/vis/vis.hh +++ b/include/vis/vis.hh @@ -239,7 +239,7 @@ extern int leaflongs; extern fs::path portalfile, statefile, statetmpfile; -void BasePortalVis(void); +void BasePortalVis(); visstats_t PortalFlow(visportal_t *p); @@ -249,9 +249,9 @@ void CalcPHS(mbsp_t *bsp); extern time_point starttime, endtime, statetime; -void SaveVisState(void); -bool LoadVisState(void); -void CleanVisState(void); +void SaveVisState(); +bool LoadVisState(); +void CleanVisState(); #include #include diff --git a/light/entities.cc b/light/entities.cc index e2385361..d1627c63 100644 --- a/light/entities.cc +++ b/light/entities.cc @@ -208,7 +208,7 @@ std::string TargetnameForLightStyle(int style) * entdicts should not be modified after this (saves pointers to elements) * ================== */ -static void MatchTargets(void) +static void MatchTargets() { for (auto &entity : all_lights) { const std::string &targetstr = entity->epairs->get("target"); @@ -1175,7 +1175,7 @@ inline void EstimateLightAABB(const std::unique_ptr &light) light->bounds = EstimateVisibleBoundsAtPoint(light->origin.value()); } -void EstimateLightVisibility(void) +void EstimateLightVisibility() { logging::funcheader(); diff --git a/light/light.cc b/light/light.cc index 4b0230b2..b326adcd 100644 --- a/light/light.cc +++ b/light/light.cc @@ -1409,7 +1409,7 @@ static void PrintLight(const light_t &light) logging::print("\n"); } -static void PrintLights(void) +static void PrintLights() { logging::print("===PrintLights===\n"); diff --git a/qbsp/map.cc b/qbsp/map.cc index bfba543e..7c6828fa 100644 --- a/qbsp/map.cc +++ b/qbsp/map.cc @@ -3366,7 +3366,7 @@ void ProcessMapBrushes() } } -void LoadMapFile(void) +void LoadMapFile() { logging::funcheader(); @@ -3609,7 +3609,7 @@ static void ConvertEntity(std::ofstream &f, const mapentity_t &entity, const con f << "}\n"; } -void ConvertMapFile(void) +void ConvertMapFile() { logging::funcheader(); diff --git a/qbsp/qbsp.cc b/qbsp/qbsp.cc index ce1010e8..af7708da 100644 --- a/qbsp/qbsp.cc +++ b/qbsp/qbsp.cc @@ -1246,7 +1246,7 @@ UpdateEntLump ================= */ -static void UpdateEntLump(void) +static void UpdateEntLump() { logging::print(logging::flag::STAT, " Updating entities lump...\n"); @@ -1473,7 +1473,7 @@ static void CreateSingleHull(hull_index_t hullnum) CreateHulls ================= */ -static void CreateHulls(void) +static void CreateHulls() { /* create the hulls sequentially */ auto &hulls = qbsp_options.target_game->get_hull_sizes(); diff --git a/qbsp/writebsp.cc b/qbsp/writebsp.cc index 59c9ed25..9cbe00fd 100644 --- a/qbsp/writebsp.cc +++ b/qbsp/writebsp.cc @@ -316,7 +316,7 @@ void ExportDrawNodes(mapentity_t &entity, node_t *headnode, int firstface) BeginBSPFile ================== */ -void BeginBSPFile(void) +void BeginBSPFile() { // First edge must remain unused because 0 can't be negated map.bsp.dedges.emplace_back(); @@ -333,7 +333,7 @@ void BeginBSPFile(void) * Writes extended texinfo flags to a file so they can be read by the light tool. * Used for phong shading and other lighting settings on func_detail. */ -static void WriteExtendedTexinfoFlags(void) +static void WriteExtendedTexinfoFlags() { auto file = fs::path(qbsp_options.bsp_path).replace_extension("texinfo.json"); bool needwrite = false; @@ -528,7 +528,7 @@ static void WriteBSPFile() FinishBSPFile ================== */ -void FinishBSPFile(void) +void FinishBSPFile() { logging::funcheader(); diff --git a/vis/flow.cc b/vis/flow.cc index 4e155be8..ab5d839a 100644 --- a/vis/flow.cc +++ b/vis/flow.cc @@ -649,7 +649,7 @@ static void BasePortalThread(size_t portalnum) BasePortalVis ============== */ -void BasePortalVis(void) +void BasePortalVis() { logging::parallel_for(0, numportals * 2, BasePortalThread); } diff --git a/vis/state.cc b/vis/state.cc index 8c099a69..6059c64f 100644 --- a/vis/state.cc +++ b/vis/state.cc @@ -131,7 +131,7 @@ static void CopyLeafBits(leafbits_t &dst, const uint8_t *src, size_t numleafs) } } -void SaveVisState(void) +void SaveVisState() { int vis_len, might_len; dvisstate_t state; @@ -187,14 +187,14 @@ void SaveVisState(void) FError("error renaming state file ({})", ec.message()); } -void CleanVisState(void) +void CleanVisState() { if (fs::exists(statefile)) { fs::remove(statefile); } } -bool LoadVisState(void) +bool LoadVisState() { fs::file_time_type prt_time, state_time; int numbytes; diff --git a/vis/vis.cc b/vis/vis.cc index ea06594a..e6575584 100644 --- a/vis/vis.cc +++ b/vis/vis.cc @@ -231,7 +231,7 @@ static std::atomic_int64_t portalIndex; the earlier information. ============= */ -visportal_t *GetNextPortal(void) +visportal_t *GetNextPortal() { visportal_t *ret = nullptr; uint32_t min = INT_MAX;