From 7912e0eee4321bbb2d62482263c39987ebf43c84 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sun, 29 Aug 2021 15:50:49 +0200 Subject: [PATCH] Use constants for .PARK magic value --- src/openrct2/FileClassifier.cpp | 3 ++- src/openrct2/ParkFile.cpp | 2 -- src/openrct2/ParkFile.h | 4 +++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/openrct2/FileClassifier.cpp b/src/openrct2/FileClassifier.cpp index 66baf6b717..8aee1095fc 100644 --- a/src/openrct2/FileClassifier.cpp +++ b/src/openrct2/FileClassifier.cpp @@ -9,6 +9,7 @@ #include "FileClassifier.h" +#include "ParkFile.h" #include "core/Console.hpp" #include "core/FileStream.h" #include "core/Path.hpp" @@ -76,7 +77,7 @@ static bool TryClassifyAsPark(OpenRCT2::IStream* stream, ClassifiedFileInfo* res try { auto magic = stream->ReadValue(); - if (magic == 0x4B524150) + if (magic == OpenRCT2::PARK_FILE_MAGIC) { result->Type = FILE_TYPE::PARK; result->Version = 0; diff --git a/src/openrct2/ParkFile.cpp b/src/openrct2/ParkFile.cpp index 50c5bafd24..6d45ab0b1f 100644 --- a/src/openrct2/ParkFile.cpp +++ b/src/openrct2/ParkFile.cpp @@ -71,8 +71,6 @@ static void UpdateFootpathsFromMapping( namespace OpenRCT2 { - constexpr uint32_t PARK_FILE_MAGIC = 0x4B524150; // PARK - // Current version that is saved. constexpr uint32_t PARK_FILE_CURRENT_VERSION = 0x3; diff --git a/src/openrct2/ParkFile.h b/src/openrct2/ParkFile.h index e525a964e2..4ce953abf0 100644 --- a/src/openrct2/ParkFile.h +++ b/src/openrct2/ParkFile.h @@ -7,8 +7,10 @@ struct ObjectRepositoryItem; namespace OpenRCT2 { + constexpr uint32_t PARK_FILE_MAGIC = 0x4B524150; // PARK + struct IStream; -} +} // namespace OpenRCT2 class ParkFileExporter {