DarkStore-3DS/DarkStore
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/DarkStore.git synced 2026-07-06 08:39:07 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Access new UniStore with version == 2.

Browse Source
This commit is contained in:
StackZ
2020-06-20 21:06:16 +02:00
parent 9860ea9719
commit c1feda24ad
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/screens/unistore.cpp
+8 -8
View File
@@ -75,9 +75,9 @@ void UniStore::autobootLogic() {
JSON = openStoreFile(); JSON = openStoreFile();
displayInformations = handleIfDisplayText(); displayInformations = handleIfDisplayText();
const std::string sheetURL = storeInfo[0].storeSheet; const std::string sheetURL = storeInfo[0].storeSheet;
if (storeInfo[0].version == 0) { if (storeInfo[0].version == 0 || storeInfo[0].version == 1) {
Gui::setScreen(std::make_unique<UniStoreV1>(JSON, sheetURL, displayInformations), config->screenFade(), true); Gui::setScreen(std::make_unique<UniStoreV1>(JSON, sheetURL, displayInformations), config->screenFade(), true);
} else if (storeInfo[0].version == 1) { } else if (storeInfo[0].version == 2) {
Gui::setScreen(std::make_unique<UniStoreV2>(JSON, sheetURL), config->screenFade(), true); Gui::setScreen(std::make_unique<UniStoreV2>(JSON, sheetURL), config->screenFade(), true);
} else { } else {
Msg::DisplayWarnMsg(Lang::get("UNISTORE_NOT_SUPPORTED")); Msg::DisplayWarnMsg(Lang::get("UNISTORE_NOT_SUPPORTED"));
@@ -593,9 +593,9 @@ void UniStore::StoreSelectionLogic(u32 hDown, u32 hHeld, touchPosition touch) {
displayInformations = handleIfDisplayText(); displayInformations = handleIfDisplayText();
const std::string sheetURL = storeInfo[Selection].storeSheet; const std::string sheetURL = storeInfo[Selection].storeSheet;
if (storeInfo[Selection].version == 0) { if (storeInfo[Selection].version == 0 || storeInfo[Selection].version == 1) {
Gui::setScreen(std::make_unique<UniStoreV1>(JSON, sheetURL, displayInformations), config->screenFade(), true); Gui::setScreen(std::make_unique<UniStoreV1>(JSON, sheetURL, displayInformations), config->screenFade(), true);
} else if (storeInfo[Selection].version == 1) { } else if (storeInfo[Selection].version == 2) {
Gui::setScreen(std::make_unique<UniStoreV2>(JSON, sheetURL), config->screenFade(), true); Gui::setScreen(std::make_unique<UniStoreV2>(JSON, sheetURL), config->screenFade(), true);
} else { } else {
Msg::DisplayWarnMsg(Lang::get("UNISTORE_NOT_SUPPORTED")); Msg::DisplayWarnMsg(Lang::get("UNISTORE_NOT_SUPPORTED"));
@@ -629,9 +629,9 @@ void UniStore::StoreSelectionLogic(u32 hDown, u32 hHeld, touchPosition touch) {
JSON = openStoreFile(); JSON = openStoreFile();
displayInformations = handleIfDisplayText(); displayInformations = handleIfDisplayText();
const std::string sheetURL = storeInfo[screenPos + i].storeSheet; const std::string sheetURL = storeInfo[screenPos + i].storeSheet;
if (storeInfo[screenPos + i].version == 0) { if (storeInfo[screenPos + i].version == 0 || storeInfo[screenPos + i].version == 1) {
Gui::setScreen(std::make_unique<UniStoreV1>(JSON, sheetURL, displayInformations), config->screenFade(), true); Gui::setScreen(std::make_unique<UniStoreV1>(JSON, sheetURL, displayInformations), config->screenFade(), true);
} else if (storeInfo[screenPos + i].version == 1) { } else if (storeInfo[screenPos + i].version == 2) {
Gui::setScreen(std::make_unique<UniStoreV2>(JSON, sheetURL), config->screenFade(), true); Gui::setScreen(std::make_unique<UniStoreV2>(JSON, sheetURL), config->screenFade(), true);
} else { } else {
Msg::DisplayWarnMsg(Lang::get("UNISTORE_NOT_SUPPORTED")); Msg::DisplayWarnMsg(Lang::get("UNISTORE_NOT_SUPPORTED"));
@@ -650,9 +650,9 @@ void UniStore::StoreSelectionLogic(u32 hDown, u32 hHeld, touchPosition touch) {
JSON = openStoreFile(); JSON = openStoreFile();
displayInformations = handleIfDisplayText(); displayInformations = handleIfDisplayText();
const std::string sheetURL = storeInfo[screenPosList + i].storeSheet; const std::string sheetURL = storeInfo[screenPosList + i].storeSheet;
if (storeInfo[screenPosList + i].version == 0) { if (storeInfo[screenPosList + i].version == 0 || storeInfo[screenPosList + i].version == 1) {
Gui::setScreen(std::make_unique<UniStoreV1>(JSON, sheetURL, displayInformations), config->screenFade(), true); Gui::setScreen(std::make_unique<UniStoreV1>(JSON, sheetURL, displayInformations), config->screenFade(), true);
} else if (storeInfo[screenPosList + i].version == 1) { } else if (storeInfo[screenPosList + i].version == 2) {
Gui::setScreen(std::make_unique<UniStoreV2>(JSON, sheetURL), config->screenFade(), true); Gui::setScreen(std::make_unique<UniStoreV2>(JSON, sheetURL), config->screenFade(), true);
} else { } else {
Msg::DisplayWarnMsg(Lang::get("UNISTORE_NOT_SUPPORTED")); Msg::DisplayWarnMsg(Lang::get("UNISTORE_NOT_SUPPORTED"));