From 7b614f22873359637258d6489adb4410bca3b52f Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Sun, 27 Oct 2024 12:50:17 +0100 Subject: [PATCH] ParkInfoCommands: mark typeToName, sourceGameToName constexpr --- src/openrct2/command_line/ParkInfoCommands.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openrct2/command_line/ParkInfoCommands.cpp b/src/openrct2/command_line/ParkInfoCommands.cpp index c3c015f1c7..19161f8ffe 100644 --- a/src/openrct2/command_line/ParkInfoCommands.cpp +++ b/src/openrct2/command_line/ParkInfoCommands.cpp @@ -90,12 +90,12 @@ static exitcode_t HandleObjectsInfo(CommandLineArgEnumerator* argEnumerator) Console::WriteLine("File contains the following objects: "); Console::WriteLine(); - const std::array typeToName = { + constexpr std::array typeToName = { "Ride", "SmallScenery", "LargeScenery", "Walls", "Banners", "Paths", "PathAdditions", "SceneryGroup", "ParkEntrance", "Water", "ScenarioText", "TerrainSurface", "TerrainEdge", "Station", "Music", "FootpathSurface", "FootpathRailings", }; - const std::array sourceGameToName = { + constexpr std::array sourceGameToName = { "Custom", "WackyWorlds", "TimeTwister", "OpenRCT2Official", "RCT1", "AddedAttractions", "LoopyLandscapes", "", "RCT2", }; @@ -120,7 +120,7 @@ static exitcode_t HandleObjectsInfo(CommandLineArgEnumerator* argEnumerator) }) { auto& list = loadResult.RequiredObjects.GetList(objType); - Console::WriteLine("ObjectType: %s, Number of Objects: %d", typeToName[EnumValue(objType)].c_str(), list.size()); + Console::WriteLine("ObjectType: %s, Number of Objects: %d", typeToName[EnumValue(objType)], list.size()); for (auto& obj : list) { if (obj.Generation == ObjectGeneration::JSON && obj.Identifier.size() == 0) @@ -129,7 +129,7 @@ static exitcode_t HandleObjectsInfo(CommandLineArgEnumerator* argEnumerator) continue; } auto* ori = OpenRCT2::GetContext()->GetObjectRepository().FindObject(obj); - Console::WriteFormat("%s Object: ", sourceGameToName[EnumValue(ori->GetFirstSourceGame())].c_str()); + Console::WriteFormat("%s Object: ", sourceGameToName[EnumValue(ori->GetFirstSourceGame())]); std::string name{ obj.GetName() }; if (obj.Generation == ObjectGeneration::DAT)