summaryrefslogtreecommitdiffstats
path: root/src/yuzu_cmd
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2021-10-15 00:14:40 +0200
committerMorph <39850852+Morph1984@users.noreply.github.com>2021-10-15 23:34:49 +0200
commit17763a44d5426f7a3e52d6d4aebc26afb1d0ce65 (patch)
tree71f31a3363f0412514277890275c973801583fec /src/yuzu_cmd
parentyuzu_cmd: Remove remaining static system instances (diff)
downloadyuzu-17763a44d5426f7a3e52d6d4aebc26afb1d0ce65.tar
yuzu-17763a44d5426f7a3e52d6d4aebc26afb1d0ce65.tar.gz
yuzu-17763a44d5426f7a3e52d6d4aebc26afb1d0ce65.tar.bz2
yuzu-17763a44d5426f7a3e52d6d4aebc26afb1d0ce65.tar.lz
yuzu-17763a44d5426f7a3e52d6d4aebc26afb1d0ce65.tar.xz
yuzu-17763a44d5426f7a3e52d6d4aebc26afb1d0ce65.tar.zst
yuzu-17763a44d5426f7a3e52d6d4aebc26afb1d0ce65.zip
Diffstat (limited to 'src/yuzu_cmd')
-rw-r--r--src/yuzu_cmd/yuzu.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index 5c36a21a2..67587cc54 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -166,27 +166,27 @@ int main(int argc, char** argv) {
system.SetFilesystem(std::make_shared<FileSys::RealVfsFilesystem>());
system.GetFileSystemController().CreateFactories(*system.GetFilesystem());
- const Core::System::ResultStatus load_result{system.Load(*emu_window, filepath)};
+ const Core::SystemResultStatus load_result{system.Load(*emu_window, filepath)};
switch (load_result) {
- case Core::System::ResultStatus::ErrorGetLoader:
+ case Core::SystemResultStatus::ErrorGetLoader:
LOG_CRITICAL(Frontend, "Failed to obtain loader for {}!", filepath);
return -1;
- case Core::System::ResultStatus::ErrorLoader:
+ case Core::SystemResultStatus::ErrorLoader:
LOG_CRITICAL(Frontend, "Failed to load ROM!");
return -1;
- case Core::System::ResultStatus::ErrorNotInitialized:
+ case Core::SystemResultStatus::ErrorNotInitialized:
LOG_CRITICAL(Frontend, "CPUCore not initialized");
return -1;
- case Core::System::ResultStatus::ErrorVideoCore:
+ case Core::SystemResultStatus::ErrorVideoCore:
LOG_CRITICAL(Frontend, "Failed to initialize VideoCore!");
return -1;
- case Core::System::ResultStatus::Success:
+ case Core::SystemResultStatus::Success:
break; // Expected case
default:
if (static_cast<u32>(load_result) >
- static_cast<u32>(Core::System::ResultStatus::ErrorLoader)) {
- const u16 loader_id = static_cast<u16>(Core::System::ResultStatus::ErrorLoader);
+ static_cast<u32>(Core::SystemResultStatus::ErrorLoader)) {
+ const u16 loader_id = static_cast<u16>(Core::SystemResultStatus::ErrorLoader);
const u16 error_id = static_cast<u16>(load_result) - loader_id;
LOG_CRITICAL(Frontend,
"While attempting to load the ROM requested, an error occurred. Please "