From f008b22e3b2baa7720ea65c320fe49929a53bad7 Mon Sep 17 00:00:00 2001 From: TheKoopaKingdom Date: Fri, 2 Jun 2017 17:03:38 -0400 Subject: Addressed Bunnei's review comments, and made some other tweaks: - Deleted GetStatus() because it wasn't used anywhere outside of Core::System. - Fixed design flaw where the message bar status could be set despite the game being stopped. --- src/core/file_sys/archive_ncch.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/core/file_sys/archive_ncch.cpp') diff --git a/src/core/file_sys/archive_ncch.cpp b/src/core/file_sys/archive_ncch.cpp index ad59c053e..6d9007731 100644 --- a/src/core/file_sys/archive_ncch.cpp +++ b/src/core/file_sys/archive_ncch.cpp @@ -42,13 +42,13 @@ ResultVal> ArchiveFactory_NCCH::Open(const Path& if (!file->IsOpen()) { // High Title ID of the archive: The category (https://3dbrew.org/wiki/Title_list). - const u32 shared_data_archive = 0x0004009B; - const u32 system_data_archive = 0x000400DB; + constexpr u32 shared_data_archive = 0x0004009B; + constexpr u32 system_data_archive = 0x000400DB; // Low Title IDs. - const u32 mii_data = 0x00010202; - const u32 region_manifest = 0x00010402; - const u32 ng_word_list = 0x00010302; + constexpr u32 mii_data = 0x00010202; + constexpr u32 region_manifest = 0x00010402; + constexpr u32 ng_word_list = 0x00010302; LOG_DEBUG(Service_FS, "Full Path: %s. Category: 0x%X. Path: 0x%X.", path.DebugStr().c_str(), high, low); @@ -60,7 +60,7 @@ ResultVal> ArchiveFactory_NCCH::Open(const Path& "Mii data"); } else if (low == region_manifest) { LOG_ERROR(Service_FS, - "Failed to get a handle for shared data archive: region manifes"); + "Failed to get a handle for shared data archive: region manifest."); Core::System::GetInstance().SetStatus(Core::System::ResultStatus::ErrorSystemFiles, "Region manifest"); } -- cgit v1.2.3