diff --git a/src/openrct2/AssetPack.cpp b/src/openrct2/AssetPack.cpp index c0a696fc6f..fc222f5bb3 100644 --- a/src/openrct2/AssetPack.cpp +++ b/src/openrct2/AssetPack.cpp @@ -42,7 +42,7 @@ void AssetPack::SetEnabled(bool value) void AssetPack::Fetch() { - auto archive = Zip::Open(Path.u8string(), ZIP_ACCESS::READ); + auto archive = Zip::Open(Path.u8string(), ZipAccess::read); if (!archive->Exists(ManifestFileName)) { throw std::runtime_error("Manifest does not exist."); @@ -160,7 +160,7 @@ public: void AssetPack::Load() { auto path = Path.u8string(); - auto archive = Zip::Open(path, ZIP_ACCESS::READ); + auto archive = Zip::Open(path, ZipAccess::read); if (!archive->Exists(ManifestFileName)) { throw std::runtime_error("Manifest does not exist."); diff --git a/src/openrct2/core/Zip.cpp b/src/openrct2/core/Zip.cpp index 96ae528b12..30a5e065d3 100644 --- a/src/openrct2/core/Zip.cpp +++ b/src/openrct2/core/Zip.cpp @@ -70,14 +70,14 @@ class ZipArchive final : public IZipArchive { private: zip_t* _zip; - ZIP_ACCESS _access; + ZipAccess _access; std::vector> _writeBuffers; public: - ZipArchive(std::string_view path, ZIP_ACCESS access) + ZipArchive(std::string_view path, ZipAccess access) { auto zipOpenMode = ZIP_RDONLY; - if (access == ZIP_ACCESS::WRITE) + if (access == ZipAccess::write) { zipOpenMode = ZIP_CREATE; } @@ -378,12 +378,12 @@ private: namespace OpenRCT2::Zip { - std::unique_ptr Open(std::string_view path, ZIP_ACCESS access) + std::unique_ptr Open(std::string_view path, ZipAccess access) { return std::make_unique(path, access); } - std::unique_ptr TryOpen(std::string_view path, ZIP_ACCESS access) + std::unique_ptr TryOpen(std::string_view path, ZipAccess access) { std::unique_ptr result; try diff --git a/src/openrct2/core/Zip.h b/src/openrct2/core/Zip.h index 631b39145e..b8c3c656ca 100644 --- a/src/openrct2/core/Zip.h +++ b/src/openrct2/core/Zip.h @@ -49,14 +49,14 @@ struct IZipArchive [[nodiscard]] bool Exists(std::string_view path) const; }; -enum class ZIP_ACCESS +enum class ZipAccess { - READ, - WRITE, + read, + write, }; namespace OpenRCT2::Zip { - [[nodiscard]] std::unique_ptr Open(std::string_view path, ZIP_ACCESS zipAccess); - [[nodiscard]] std::unique_ptr TryOpen(std::string_view path, ZIP_ACCESS zipAccess); + [[nodiscard]] std::unique_ptr Open(std::string_view path, ZipAccess zipAccess); + [[nodiscard]] std::unique_ptr TryOpen(std::string_view path, ZipAccess zipAccess); } // namespace OpenRCT2::Zip diff --git a/src/openrct2/core/ZipAndroid.cpp b/src/openrct2/core/ZipAndroid.cpp index b01c586e46..13fb35b24d 100644 --- a/src/openrct2/core/ZipAndroid.cpp +++ b/src/openrct2/core/ZipAndroid.cpp @@ -28,7 +28,7 @@ private: jobject _zip; public: - ZipArchive(std::string_view path, ZIP_ACCESS access) + ZipArchive(std::string_view path, ZipAccess access) { // retrieve the JNI environment. JNIEnv* env = (JNIEnv*)SDL_AndroidGetJNIEnv(); @@ -139,12 +139,12 @@ public: namespace OpenRCT2::Zip { - std::unique_ptr Open(std::string_view path, ZIP_ACCESS access) + std::unique_ptr Open(std::string_view path, ZipAccess access) { return std::make_unique(path, access); } - std::unique_ptr TryOpen(std::string_view path, ZIP_ACCESS access) + std::unique_ptr TryOpen(std::string_view path, ZipAccess access) { std::unique_ptr result; try diff --git a/src/openrct2/object/Object.cpp b/src/openrct2/object/Object.cpp index 79f1a13f01..6082d15586 100644 --- a/src/openrct2/object/Object.cpp +++ b/src/openrct2/object/Object.cpp @@ -311,7 +311,7 @@ bool ObjectAsset::IsAvailable() const return File::Exists(_path); } - auto zipArchive = Zip::TryOpen(_zipPath, ZIP_ACCESS::READ); + auto zipArchive = Zip::TryOpen(_zipPath, ZipAccess::read); return zipArchive != nullptr && zipArchive->Exists(_path); } @@ -322,7 +322,7 @@ uint64_t ObjectAsset::GetSize() const return File::GetSize(_path); } - auto zipArchive = Zip::TryOpen(_zipPath, ZIP_ACCESS::READ); + auto zipArchive = Zip::TryOpen(_zipPath, ZipAccess::read); if (zipArchive != nullptr) { auto index = zipArchive->GetIndexFromPath(_path); @@ -342,7 +342,7 @@ std::vector ObjectAsset::GetData() const return File::ReadAllBytes(_path); } - auto zipArchive = Zip::TryOpen(_zipPath, ZIP_ACCESS::READ); + auto zipArchive = Zip::TryOpen(_zipPath, ZipAccess::read); if (zipArchive != nullptr) { return zipArchive->GetFileData(_path); @@ -359,7 +359,7 @@ std::unique_ptr ObjectAsset::GetStream() const return std::make_unique(_path, FileMode::open); } - auto zipArchive = Zip::TryOpen(_zipPath, ZIP_ACCESS::READ); + auto zipArchive = Zip::TryOpen(_zipPath, ZipAccess::read); if (zipArchive != nullptr) { auto stream = zipArchive->GetFileStream(_path); diff --git a/src/openrct2/object/ObjectFactory.cpp b/src/openrct2/object/ObjectFactory.cpp index bf610bfd2c..9f428069fc 100644 --- a/src/openrct2/object/ObjectFactory.cpp +++ b/src/openrct2/object/ObjectFactory.cpp @@ -433,7 +433,7 @@ namespace OpenRCT2::ObjectFactory { try { - auto archive = Zip::Open(path, ZIP_ACCESS::READ); + auto archive = Zip::Open(path, ZipAccess::read); auto jsonBytes = archive->GetFileData("object.json"); if (jsonBytes.empty()) { diff --git a/src/openrct2/scenes/title/TitleSequence.cpp b/src/openrct2/scenes/title/TitleSequence.cpp index 774e24ebbb..f32a72aab9 100644 --- a/src/openrct2/scenes/title/TitleSequence.cpp +++ b/src/openrct2/scenes/title/TitleSequence.cpp @@ -59,7 +59,7 @@ namespace OpenRCT2::Title auto ext = Path::GetExtension(path); if (String::equals(ext, TITLE_SEQUENCE_EXTENSION)) { - auto zip = Zip::TryOpen(path, ZIP_ACCESS::READ); + auto zip = Zip::TryOpen(path, ZipAccess::read); if (zip == nullptr) { Console::Error::WriteLine("Unable to open '%s'", path.c_str()); @@ -109,7 +109,7 @@ namespace OpenRCT2::Title const auto& filename = seq.Saves[index]; if (seq.IsZip) { - auto zip = Zip::TryOpen(seq.Path, ZIP_ACCESS::READ); + auto zip = Zip::TryOpen(seq.Path, ZipAccess::read); if (zip != nullptr) { auto data = zip->GetFileData(filename); @@ -159,7 +159,7 @@ namespace OpenRCT2::Title if (seq.IsZip) { auto fdata = std::vector(script.begin(), script.end()); - auto zip = Zip::Open(seq.Path, ZIP_ACCESS::WRITE); + auto zip = Zip::Open(seq.Path, ZipAccess::write); zip->SetFileData("script.txt", std::move(fdata)); } else @@ -189,7 +189,7 @@ namespace OpenRCT2::Title try { auto fdata = File::ReadAllBytes(path); - auto zip = Zip::TryOpen(seq.Path, ZIP_ACCESS::WRITE); + auto zip = Zip::TryOpen(seq.Path, ZipAccess::write); if (zip == nullptr) { Console::Error::WriteLine("Unable to open '%s'", seq.Path.c_str()); @@ -222,7 +222,7 @@ namespace OpenRCT2::Title auto& oldRelativePath = seq.Saves[index]; if (seq.IsZip) { - auto zip = Zip::TryOpen(seq.Path, ZIP_ACCESS::WRITE); + auto zip = Zip::TryOpen(seq.Path, ZipAccess::write); if (zip == nullptr) { Console::Error::WriteLine("Unable to open '%s'", seq.Path.c_str()); @@ -252,7 +252,7 @@ namespace OpenRCT2::Title auto& relativePath = seq.Saves[index]; if (seq.IsZip) { - auto zip = Zip::TryOpen(seq.Path, ZIP_ACCESS::WRITE); + auto zip = Zip::TryOpen(seq.Path, ZipAccess::write); if (zip == nullptr) { Console::Error::WriteLine("Unable to open '%s'", seq.Path.c_str());