mirror/pineapple
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

early-access version 1285

Browse source
This commit is contained in:
pineappleEA 2021-01-04 00:44:02 +01:00
parent 31e5e705fd
commit 3980d74899
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,7 +1,7 @@
yuzu emulator early access yuzu emulator early access
============= =============
This is the source code for early-access 1284. This is the source code for early-access 1285.
## Legal Notice ## Legal Notice

4
src/core/loader/loader.cpp
View file

@ -185,6 +185,10 @@ constexpr std::array<const char*, 66> RESULT_MESSAGES{
"The INI file contains more than the maximum allowable number of KIP files.", "The INI file contains more than the maximum allowable number of KIP files.",
}; };
std::string GetResultStatusString(ResultStatus status) {
return RESULT_MESSAGES.at(static_cast<std::size_t>(status));
}
std::ostream& operator<<(std::ostream& os, ResultStatus status) { std::ostream& operator<<(std::ostream& os, ResultStatus status) {
os << RESULT_MESSAGES.at(static_cast<std::size_t>(status)); os << RESULT_MESSAGES.at(static_cast<std::size_t>(status));
return os; return os;

1
src/core/loader/loader.h
View file

@ -135,6 +135,7 @@ enum class ResultStatus : u16 {
ErrorINITooManyKIPs, ErrorINITooManyKIPs,
}; };
std::string GetResultStatusString(ResultStatus status);
std::ostream& operator<<(std::ostream& os, ResultStatus status); std::ostream& operator<<(std::ostream& os, ResultStatus status);
/// Interface for loading an application /// Interface for loading an application

5
src/yuzu/main.cpp
View file

@ -1094,8 +1094,9 @@ bool GMainWindow::LoadROM(const QString& filename, std::size_t program_index) {
tr("%1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the " tr("%1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the "
"yuzu quickstart guide</a> to redump your files.<br>You can refer " "yuzu quickstart guide</a> to redump your files.<br>You can refer "
"to the yuzu wiki</a> or the yuzu Discord</a> for help.", "to the yuzu wiki</a> or the yuzu Discord</a> for help.",
"%1 signifies a numeric error ID.") "%1 signifies an error string.")
.arg(error_id); .arg(QString::fromStdString(
GetResultStatusString(static_cast<Loader::ResultStatus>(error_id))));
QMessageBox::critical(this, title, description); QMessageBox::critical(this, title, description);
} else { } else {