summaryrefslogtreecommitdiff
path: root/src/core/file_sys
diff options
context:
space:
mode:
authorGravatar TheKoopaKingdom2017-06-02 17:03:38 -0400
committerGravatar TheKoopaKingdom2017-06-02 18:40:39 -0400
commitf008b22e3b2baa7720ea65c320fe49929a53bad7 (patch)
tree24a15888dd6ebc515a09eaf00623fa23e2d4665d /src/core/file_sys
parentFixed wiki URLs. (diff)
downloadyuzu-f008b22e3b2baa7720ea65c320fe49929a53bad7.tar.gz
yuzu-f008b22e3b2baa7720ea65c320fe49929a53bad7.tar.xz
yuzu-f008b22e3b2baa7720ea65c320fe49929a53bad7.zip
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.
Diffstat (limited to 'src/core/file_sys')
-rw-r--r--src/core/file_sys/archive_ncch.cpp12
1 files changed, 6 insertions, 6 deletions
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<std::unique_ptr<ArchiveBackend>> ArchiveFactory_NCCH::Open(const Path&
42 42
43 if (!file->IsOpen()) { 43 if (!file->IsOpen()) {
44 // High Title ID of the archive: The category (https://3dbrew.org/wiki/Title_list). 44 // High Title ID of the archive: The category (https://3dbrew.org/wiki/Title_list).
45 const u32 shared_data_archive = 0x0004009B; 45 constexpr u32 shared_data_archive = 0x0004009B;
46 const u32 system_data_archive = 0x000400DB; 46 constexpr u32 system_data_archive = 0x000400DB;
47 47
48 // Low Title IDs. 48 // Low Title IDs.
49 const u32 mii_data = 0x00010202; 49 constexpr u32 mii_data = 0x00010202;
50 const u32 region_manifest = 0x00010402; 50 constexpr u32 region_manifest = 0x00010402;
51 const u32 ng_word_list = 0x00010302; 51 constexpr u32 ng_word_list = 0x00010302;
52 52
53 LOG_DEBUG(Service_FS, "Full Path: %s. Category: 0x%X. Path: 0x%X.", path.DebugStr().c_str(), 53 LOG_DEBUG(Service_FS, "Full Path: %s. Category: 0x%X. Path: 0x%X.", path.DebugStr().c_str(),
54 high, low); 54 high, low);
@@ -60,7 +60,7 @@ ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_NCCH::Open(const Path&
60 "Mii data"); 60 "Mii data");
61 } else if (low == region_manifest) { 61 } else if (low == region_manifest) {
62 LOG_ERROR(Service_FS, 62 LOG_ERROR(Service_FS,
63 "Failed to get a handle for shared data archive: region manifes"); 63 "Failed to get a handle for shared data archive: region manifest.");
64 Core::System::GetInstance().SetStatus(Core::System::ResultStatus::ErrorSystemFiles, 64 Core::System::GetInstance().SetStatus(Core::System::ResultStatus::ErrorSystemFiles,
65 "Region manifest"); 65 "Region manifest");
66 } 66 }