From 8d478e78a5debdff70f209d95d228478c1110416 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Fri, 23 Feb 2024 23:51:44 +0100 Subject: [PATCH] Refactor FILE_TYPE_S4_CUTOFF to kFileTypeS4Cutoff --- src/openrct2/Context.cpp | 2 +- src/openrct2/FileClassifier.h | 2 +- src/openrct2/command_line/ParkInfoCommands.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 3d308e594d..a3bf35234f 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -628,7 +628,7 @@ namespace OpenRCT2 { parkImporter = ParkImporter::CreateParkFile(*_objectRepository); } - else if (info.Version <= FILE_TYPE_S4_CUTOFF) + else if (info.Version <= kFileTypeS4Cutoff) { // Save is an S4 (RCT1 format) parkImporter = ParkImporter::CreateS4(); diff --git a/src/openrct2/FileClassifier.h b/src/openrct2/FileClassifier.h index 2ea4c0a302..448f104fbe 100644 --- a/src/openrct2/FileClassifier.h +++ b/src/openrct2/FileClassifier.h @@ -48,7 +48,7 @@ struct ClassifiedFileInfo uint32_t Version = 0; }; -#define FILE_TYPE_S4_CUTOFF 2 +constexpr uint32_t kFileTypeS4Cutoff = 2; bool TryClassifyFile(const std::string& path, ClassifiedFileInfo* result); bool TryClassifyFile(OpenRCT2::IStream* stream, ClassifiedFileInfo* result); diff --git a/src/openrct2/command_line/ParkInfoCommands.cpp b/src/openrct2/command_line/ParkInfoCommands.cpp index 07af5affd9..7a68e4ea3f 100644 --- a/src/openrct2/command_line/ParkInfoCommands.cpp +++ b/src/openrct2/command_line/ParkInfoCommands.cpp @@ -73,7 +73,7 @@ static exitcode_t HandleObjectsInfo(CommandLineArgEnumerator* argEnumerator) { parkImporter = ParkImporter::CreateParkFile(objectRepository); } - else if (info.Version <= FILE_TYPE_S4_CUTOFF) + else if (info.Version <= kFileTypeS4Cutoff) { // Save is an S4 (RCT1 format) parkImporter = ParkImporter::CreateS4();