diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index acb0f8e5f7..dc9193ca44 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -375,7 +375,8 @@ static void window_editor_objective_options_main_mouseup(rct_window* w, rct_widg break; } case WIDX_SCENARIO_NAME: - window_text_input_raw_open(w, WIDX_SCENARIO_NAME, STR_SCENARIO_NAME, STR_ENTER_SCENARIO_NAME, gScenarioName.c_str(), 64); + window_text_input_raw_open( + w, WIDX_SCENARIO_NAME, STR_SCENARIO_NAME, STR_ENTER_SCENARIO_NAME, gScenarioName.c_str(), 64); break; case WIDX_DETAILS: window_text_input_raw_open( diff --git a/src/openrct2/ParkFile.cpp b/src/openrct2/ParkFile.cpp index d06701f941..cca5f7bd3b 100644 --- a/src/openrct2/ParkFile.cpp +++ b/src/openrct2/ParkFile.cpp @@ -468,7 +468,8 @@ namespace OpenRCT2 auto legacyIdentifier = entry.GetName(); if (objRepository.FindObjectLegacy(legacyIdentifier) == nullptr) { - objRepository.AddObjectFromFile(ObjectGeneration::DAT, legacyIdentifier, data.data(), data.size()); + objRepository.AddObjectFromFile( + ObjectGeneration::DAT, legacyIdentifier, data.data(), data.size()); } } else if (type == DESCRIPTOR_PARKOBJ) diff --git a/src/openrct2/object/DefaultObjects.cpp b/src/openrct2/object/DefaultObjects.cpp index ddb2f92acc..3a4e522df4 100644 --- a/src/openrct2/object/DefaultObjects.cpp +++ b/src/openrct2/object/DefaultObjects.cpp @@ -11,10 +11,7 @@ #include "Object.h" -const std::string_view MinimumRequiredObjects[] = { - "rct2.surface.grass", - "rct2.edge.rock" -}; +const std::string_view MinimumRequiredObjects[] = { "rct2.surface.grass", "rct2.edge.rock" }; const std::string_view DefaultSelectedObjects[] = { // An initial default selection diff --git a/src/openrct2/object/ObjectRepository.h b/src/openrct2/object/ObjectRepository.h index d161fe4785..ed01aab083 100644 --- a/src/openrct2/object/ObjectRepository.h +++ b/src/openrct2/object/ObjectRepository.h @@ -82,7 +82,8 @@ struct IObjectRepository virtual void UnregisterLoadedObject(const ObjectRepositoryItem* ori, Object* object) abstract; virtual void AddObject(const rct_object_entry* objectEntry, const void* data, size_t dataSize) abstract; - virtual void AddObjectFromFile(ObjectGeneration generation, std::string_view objectName, const void* data, size_t dataSize) abstract; + virtual void AddObjectFromFile( + ObjectGeneration generation, std::string_view objectName, const void* data, size_t dataSize) abstract; virtual void ExportPackedObject(OpenRCT2::IStream* stream) abstract; virtual void WritePackedObjects(OpenRCT2::IStream* stream, std::vector& objects) abstract; diff --git a/src/openrct2/platform/Crash.cpp b/src/openrct2/platform/Crash.cpp index 2f507adb7d..654768e7f7 100644 --- a/src/openrct2/platform/Crash.cpp +++ b/src/openrct2/platform/Crash.cpp @@ -320,7 +320,7 @@ CExceptionHandler crash_init() auto exHandler = new google_breakpad::ExceptionHandler( GetDumpDirectory(), 0, OnCrash, 0, google_breakpad::ExceptionHandler::HANDLER_ALL, MiniDumpWithDataSegs, PipeName, 0); return reinterpret_cast(exHandler); -#else // USE_BREAKPAD +#else // USE_BREAKPAD return nullptr; #endif // USE_BREAKPAD } diff --git a/src/openrct2/util/Util.h b/src/openrct2/util/Util.h index d502cc8bce..414a9741fa 100644 --- a/src/openrct2/util/Util.h +++ b/src/openrct2/util/Util.h @@ -73,13 +73,13 @@ uint8_t soft_light(uint8_t a, uint8_t b); size_t strcatftime(char* buffer, size_t bufferSize, const char* format, const struct tm* tp); -template [[nodiscard]] constexpr uint64_t EnumToFlag(T v) +template[[nodiscard]] constexpr uint64_t EnumToFlag(T v) { static_assert(std::is_enum_v); return 1ULL << static_cast>(v); } -template [[nodiscard]] constexpr uint64_t EnumsToFlags(T... types) +template[[nodiscard]] constexpr uint64_t EnumsToFlags(T... types) { return (EnumToFlag(types) | ...); }