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

See desc for more.

Browse Source 
[MAKEFILE]: Properly use PATH for Bannertool and Makerom instead of hardcoded to the root directory on Windows.

[QUEUE SYSTEM]: Do not allow going to Home Menu if queue isn't done. Or better said: Show the prompt message with the side effects.
This commit is contained in:
StackZ
2021-04-19 09:30:59 +02:00
parent 65616e8f58
commit 2b4e67e469
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+5 -5
View File
@@ -35,8 +35,8 @@ include $(DEVKITARM)/3ds_rules
# External tools # External tools
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
MAKEROM ?= ../makerom.exe MAKEROM ?= makerom.exe
BANNERTOOL ?= ../bannertool.exe BANNERTOOL ?= bannertool.exe
else else
MAKEROM ?= makerom MAKEROM ?= makerom
@@ -262,12 +262,12 @@ all: $(OUTPUT).cia $(OUTPUT).elf $(OUTPUT).3dsx
$(OUTPUT).elf : $(OFILES) $(OUTPUT).elf : $(OFILES)
$(OUTPUT).cia : $(OUTPUT).elf $(OUTPUT).smdh $(OUTPUT).cia : $(OUTPUT).elf $(OUTPUT).smdh
$(BANNERTOOL) makebanner -i "../app/banner.png" -a "../app/BannerAudio.wav" -o "../app/banner.bin" @$(BANNERTOOL) makebanner -i "../app/banner.png" -a "../app/BannerAudio.wav" -o "../app/banner.bin"
$(BANNERTOOL) makesmdh -i "../app/icon.png" -s "$(TARGET)" -l "$(APP_DESCRIPTION)" -p "$(APP_AUTHOR)" -o "../app/icon.bin" \ @$(BANNERTOOL) makesmdh -i "../app/icon.png" -s "$(TARGET)" -l "$(APP_DESCRIPTION)" -p "$(APP_AUTHOR)" -o "../app/icon.bin" \
--flags visible,ratingrequired,recordusage --cero 153 --esrb 153 --usk 153 --pegigen 153 --pegiptr 153 --pegibbfc 153 --cob 153 --grb 153 --cgsrr 153 --flags visible,ratingrequired,recordusage --cero 153 --esrb 153 --usk 153 --pegigen 153 --pegiptr 153 --pegibbfc 153 --cob 153 --grb 153 --cgsrr 153
$(MAKEROM) -f cia -target t -exefslogo -o "../$(TARGET).cia" -elf "../$(TARGET).elf" -rsf "../app/build-cia.rsf" -banner "../app/banner.bin" -icon "../app/icon.bin" -logo "../app/logo.bcma.lz" -DAPP_ROMFS="$(TOPDIR)/$(ROMFS)" -major $(VERSION_MAJOR) -minor $(VERSION_MINOR) -micro $(VERSION_MICRO) -DAPP_VERSION_MAJOR="$(VERSION_MAJOR)" @$(MAKEROM) -f cia -target t -exefslogo -o "../$(TARGET).cia" -elf "../$(TARGET).elf" -rsf "../app/build-cia.rsf" -banner "../app/banner.bin" -icon "../app/icon.bin" -logo "../app/logo.bcma.lz" -DAPP_ROMFS="$(TOPDIR)/$(ROMFS)" -major $(VERSION_MAJOR) -minor $(VERSION_MINOR) -micro $(VERSION_MICRO) -DAPP_VERSION_MAJOR="$(VERSION_MAJOR)"
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# you need a rule like this for each extension you use as binary data # you need a rule like this for each extension you use as binary data
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
source/init.cpp
+4
View File
@@ -196,6 +196,10 @@ Result Init::MainLoop() {
if (!exiting) Gui::ScreenLogic(hDown, hHeld, touch, true, false); if (!exiting) Gui::ScreenLogic(hDown, hHeld, touch, true, false);
if (aptCheckHomePressRejected()) {
if (Msg::promptMsg(Lang::get("FEATURE_SIDE_EFFECTS"))) aptSetHomeAllowed(true);
};
if (exiting) { if (exiting) {
if (hDown & KEY_START) fullExit = true; // Make it optionally faster. if (hDown & KEY_START) fullExit = true; // Make it optionally faster.
source/utils/queueSystem.cpp
+4
View File
@@ -63,6 +63,7 @@ void QueueSystem::AddToQueue(nlohmann::json obj, const C2D_Image &icn, const std
svcGetThreadPriority(&prio, CUR_THREAD_HANDLE); svcGetThreadPriority(&prio, CUR_THREAD_HANDLE);
queueThread = threadCreate((ThreadFunc)QueueSystem::QueueHandle, NULL, 64 * 1024, prio - 1, -2, false); queueThread = threadCreate((ThreadFunc)QueueSystem::QueueHandle, NULL, 64 * 1024, prio - 1, -2, false);
aptSetHomeAllowed(false);
} }
} }
@@ -84,6 +85,7 @@ void QueueSystem::ClearQueue() {
Use this, to go back to the queue after the Request. Use this, to go back to the queue after the Request.
*/ */
void QueueSystem::Resume() { void QueueSystem::Resume() {
aptSetHomeAllowed(false);
QueueSystem::Wait = false; QueueSystem::Wait = false;
QueueRuns = true; QueueRuns = true;
@@ -388,4 +390,6 @@ void QueueSystem::QueueHandle() {
ret = NONE; // Reset. ret = NONE; // Reset.
} }
} }
aptSetHomeAllowed(true);
} }