summaryrefslogtreecommitdiff
path: root/src/yuzu_cmd/yuzu.cpp
diff options
context:
space:
mode:
authorGravatar Morph2021-10-14 18:14:40 -0400
committerGravatar Morph2021-10-15 17:34:49 -0400
commit17763a44d5426f7a3e52d6d4aebc26afb1d0ce65 (patch)
tree71f31a3363f0412514277890275c973801583fec /src/yuzu_cmd/yuzu.cpp
parentyuzu_cmd: Remove remaining static system instances (diff)
downloadyuzu-17763a44d5426f7a3e52d6d4aebc26afb1d0ce65.tar.gz
yuzu-17763a44d5426f7a3e52d6d4aebc26afb1d0ce65.tar.xz
yuzu-17763a44d5426f7a3e52d6d4aebc26afb1d0ce65.zip
core: Move ResultStatus outside of System
Allows it to be a forward declaration in other header files.
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
-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) {
166 system.SetFilesystem(std::make_shared<FileSys::RealVfsFilesystem>()); 166 system.SetFilesystem(std::make_shared<FileSys::RealVfsFilesystem>());
167 system.GetFileSystemController().CreateFactories(*system.GetFilesystem()); 167 system.GetFileSystemController().CreateFactories(*system.GetFilesystem());
168 168
169 const Core::System::ResultStatus load_result{system.Load(*emu_window, filepath)}; 169 const Core::SystemResultStatus load_result{system.Load(*emu_window, filepath)};
170 170
171 switch (load_result) { 171 switch (load_result) {
172 case Core::System::ResultStatus::ErrorGetLoader: 172 case Core::SystemResultStatus::ErrorGetLoader:
173 LOG_CRITICAL(Frontend, "Failed to obtain loader for {}!", filepath); 173 LOG_CRITICAL(Frontend, "Failed to obtain loader for {}!", filepath);
174 return -1; 174 return -1;
175 case Core::System::ResultStatus::ErrorLoader: 175 case Core::SystemResultStatus::ErrorLoader:
176 LOG_CRITICAL(Frontend, "Failed to load ROM!"); 176 LOG_CRITICAL(Frontend, "Failed to load ROM!");
177 return -1; 177 return -1;
178 case Core::System::ResultStatus::ErrorNotInitialized: 178 case Core::SystemResultStatus::ErrorNotInitialized:
179 LOG_CRITICAL(Frontend, "CPUCore not initialized"); 179 LOG_CRITICAL(Frontend, "CPUCore not initialized");
180 return -1; 180 return -1;
181 case Core::System::ResultStatus::ErrorVideoCore: 181 case Core::SystemResultStatus::ErrorVideoCore:
182 LOG_CRITICAL(Frontend, "Failed to initialize VideoCore!"); 182 LOG_CRITICAL(Frontend, "Failed to initialize VideoCore!");
183 return -1; 183 return -1;
184 case Core::System::ResultStatus::Success: 184 case Core::SystemResultStatus::Success:
185 break; // Expected case 185 break; // Expected case
186 default: 186 default:
187 if (static_cast<u32>(load_result) > 187 if (static_cast<u32>(load_result) >
188 static_cast<u32>(Core::System::ResultStatus::ErrorLoader)) { 188 static_cast<u32>(Core::SystemResultStatus::ErrorLoader)) {
189 const u16 loader_id = static_cast<u16>(Core::System::ResultStatus::ErrorLoader); 189 const u16 loader_id = static_cast<u16>(Core::SystemResultStatus::ErrorLoader);
190 const u16 error_id = static_cast<u16>(load_result) - loader_id; 190 const u16 error_id = static_cast<u16>(load_result) - loader_id;
191 LOG_CRITICAL(Frontend, 191 LOG_CRITICAL(Frontend,
192 "While attempting to load the ROM requested, an error occurred. Please " 192 "While attempting to load the ROM requested, an error occurred. Please "