mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-05 08:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review comments

Browse Source
This commit is contained in:
kalaposfos13 2025-01-18 11:11:41 +01:00
parent adaeb7ca6d
commit 0063fcbc03
5 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/linker.h
View File

@ -143,7 +143,7 @@ public:
void Relocate(Module* module); void Relocate(Module* module);
bool Resolve(const std::string& name, Loader::SymbolType type, Module* module, bool Resolve(const std::string& name, Loader::SymbolType type, Module* module,
Loader::SymbolRecord* return_info); Loader::SymbolRecord* return_info);
void Execute(const std::vector<std::string> args = std::vector<std::string>()); void Execute(const std::vector<std::string> args = {});
void DebugDump(); void DebugDump();
private: private:

2
src/emulator.cpp
View File

@ -152,7 +152,7 @@ void Emulator::Run(const std::filesystem::path& file, const std::vector<std::str
psf_attributes.raw = *raw_attributes; psf_attributes.raw = *raw_attributes;
} }
if (!args.empty()) { if (!args.empty()) {
int argc = args.size() > 32 ? 32 : args.size(); int argc = std::min<int>(args.size(), 32);
for (int i = 0; i < argc; i++) { for (int i = 0; i < argc; i++) {
LOG_INFO(Loader, "Game argument {}: {}", i, args[i]); LOG_INFO(Loader, "Game argument {}: {}", i, args[i]);
} }

2
src/emulator.h
View File

@ -26,7 +26,7 @@ public:
~Emulator(); ~Emulator();
void Run(const std::filesystem::path& file, void Run(const std::filesystem::path& file,
const std::vector<std::string> args = std::vector<std::string>()); const std::vector<std::string> args = {});
void UpdatePlayTime(const std::string& serial); void UpdatePlayTime(const std::string& serial);
private: private:

9
src/main.cpp
View File

@ -139,18 +139,11 @@ int main(int argc, char* argv[]) {
game_args.push_back(argv[j]); game_args.push_back(argv[j]);
} }
break; break;
} else if (std::string(argv[i + 1]) == "--") { } else if (i + 1 < argc && std::string(argv[i + 1]) == "--") {
if (!has_game_argument) { if (!has_game_argument) {
game_path = argv[i]; game_path = argv[i];
has_game_argument = true; has_game_argument = true;
} }
if (i + 2 == argc) {
std::cerr << "Warning: -- is set, but no game arguments are added!\n";
break;
}
for (int j = i + 2; j < argc; j++) {
game_args.push_back(argv[j]);
}
break; break;
} else { } else {
std::cerr << "Unknown argument: " << cur_arg << ", see --help for info.\n"; std::cerr << "Unknown argument: " << cur_arg << ", see --help for info.\n";

10
src/qt_gui/main.cpp
View File

@ -144,19 +144,11 @@ int main(int argc, char* argv[]) {
game_args.push_back(argv[j]); game_args.push_back(argv[j]);
} }
break; break;
} else if (std::string(argv[i + 1]) == "--") { } else if (i + 1 < argc && std::string(argv[i + 1]) == "--") {
if (!has_game_argument) { if (!has_game_argument) {
game_path = argv[i]; game_path = argv[i];
has_game_argument = true; has_game_argument = true;
} }
if (i + 2 == argc) {
std::cerr << "Warning: -- is set, but no game arguments are added!\n";
break;
}
for (int j = i + 2; j < argc; j++) {
game_args.push_back(argv[j]);
}
break;
} else { } else {
std::cerr << "Unknown argument: " << cur_arg << ", see --help for info.\n"; std::cerr << "Unknown argument: " << cur_arg << ", see --help for info.\n";
return 1; return 1;