mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Code Issues Releases Wiki Activity

Fix formatting

Browse Source
This commit is contained in:
Gymnasiast
2021-04-09 15:59:14 +02:00
parent f416898516
commit d96ed5499e
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/openrct2-ui/windows/EditorObjectiveOptions.cpp
View File

@@ -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(

3
src/openrct2/ParkFile.cpp
View File

@@ -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)

5
src/openrct2/object/DefaultObjects.cpp
View File

@@ -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

3
src/openrct2/object/ObjectRepository.h
View File

@@ -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<const ObjectRepositoryItem*>& objects) abstract;

2
src/openrct2/platform/Crash.cpp
View File

@@ -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<CExceptionHandler>(exHandler);
#else // USE_BREAKPAD
#else // USE_BREAKPAD
return nullptr;
#endif // USE_BREAKPAD
}

4
src/openrct2/util/Util.h
View File

@@ -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<typename T> [[nodiscard]] constexpr uint64_t EnumToFlag(T v)
template<typename T>[[nodiscard]] constexpr uint64_t EnumToFlag(T v)
{
static_assert(std::is_enum_v<T>);
return 1ULL << static_cast<std::underlying_type_t<T>>(v);
}
template<typename... T> [[nodiscard]] constexpr uint64_t EnumsToFlags(T... types)
template<typename... T>[[nodiscard]] constexpr uint64_t EnumsToFlags(T... types)
{
return (EnumToFlag(types) | ...);
}