Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 06:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Android) Added support for an %EXTRAARRAY% variable

Browse source
This commit is contained in:
Leon Styhre 2024-02-06 18:58:38 +01:00
parent 6f73f7381d
commit 5453aeffb8
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
es-app/src/FileData.cpp
View file

@ -977,6 +977,7 @@ void FileData::launchGame()
std::string androidMimeType; std::string androidMimeType;
std::string androidData; std::string androidData;
std::map<std::string, std::string> androidExtrasString; std::map<std::string, std::string> androidExtrasString;
std::map<std::string, std::string> androidExtrasStringArray;
std::map<std::string, std::string> androidExtrasBool; std::map<std::string, std::string> androidExtrasBool;
std::vector<std::string> androidActivityFlags; std::vector<std::string> androidActivityFlags;
#endif #endif
@ -1685,7 +1686,7 @@ void FileData::launchGame()
} }
} }
std::vector<std::string> extraVariabels {"%EXTRA_", "%EXTRABOOL_"}; std::vector<std::string> extraVariabels {"%EXTRA_", "%EXTRAARRAY_", "%EXTRABOOL_"};
for (std::string variable : extraVariabels) { for (std::string variable : extraVariabels) {
size_t extraPos {command.find(variable)}; size_t extraPos {command.find(variable)};
@ -1742,6 +1743,8 @@ void FileData::launchGame()
if (extraName != "" && extraValue != "") { if (extraName != "" && extraValue != "") {
if (variable == "%EXTRA_") if (variable == "%EXTRA_")
androidExtrasString[extraName] = extraValue; androidExtrasString[extraName] = extraValue;
else if (variable == "%EXTRAARRAY_")
androidExtrasStringArray[extraName] = extraValue;
else if (variable == "%EXTRABOOL_") else if (variable == "%EXTRABOOL_")
androidExtrasBool[extraName] = extraValue; androidExtrasBool[extraName] = extraValue;
} }
@ -1823,6 +1826,10 @@ void FileData::launchGame()
LOG(LogInfo) << "Extra name: " << extra.first; LOG(LogInfo) << "Extra name: " << extra.first;
LOG(LogInfo) << "Extra value: " << extra.second; LOG(LogInfo) << "Extra value: " << extra.second;
} }
for (auto& extra : androidExtrasStringArray) {
LOG(LogInfo) << "Extra array name: " << extra.first;
LOG(LogInfo) << "Extra array value: " << extra.second;
}
for (auto& extra : androidExtrasBool) { for (auto& extra : androidExtrasBool) {
LOG(LogInfo) << "Extra bool name: " << extra.first; LOG(LogInfo) << "Extra bool name: " << extra.first;
LOG(LogInfo) << "Extra bool value: " << extra.second; LOG(LogInfo) << "Extra bool value: " << extra.second;
@ -1852,7 +1859,8 @@ void FileData::launchGame()
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
returnValue = Utils::Platform::Android::launchGame( returnValue = Utils::Platform::Android::launchGame(
androidPackage, androidActivity, androidAction, androidCategory, androidMimeType, androidPackage, androidActivity, androidAction, androidCategory, androidMimeType,
androidData, romRaw, androidExtrasString, androidExtrasBool, androidActivityFlags); androidData, romRaw, androidExtrasString, androidExtrasStringArray, androidExtrasBool,
androidActivityFlags);
#else #else
returnValue = Utils::Platform::launchGameUnix(command, startDirectory, runInBackground); returnValue = Utils::Platform::launchGameUnix(command, startDirectory, runInBackground);
#endif #endif