The-Homebrew-Cloud/EnvironmentLoader
2
0
Fork 0
mirror of https://github.com/wiiu-env/EnvironmentLoader.git synced 2024-11-27 16:24:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanups

Browse Source
This commit is contained in:
Maschell 2021-12-29 16:54:37 +01:00
parent 1fc0b0d8de
commit 31f14b6410
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/main.cpp
View File

@ -115,7 +115,6 @@ int main(int argc, char **argv) {
if (strncmp(environmentPath, "fs:/vol/external01/wiiu/environments/", strlen("fs:/vol/external01/wiiu/environments/")) != 0) { if (strncmp(environmentPath, "fs:/vol/external01/wiiu/environments/", strlen("fs:/vol/external01/wiiu/environments/")) != 0) {
DirList environmentDirs("fs:/vol/external01/wiiu/environments/", nullptr, DirList::Dirs, 1); DirList environmentDirs("fs:/vol/external01/wiiu/environments/", nullptr, DirList::Dirs, 1);
bool foundFromConfig = false;
bool forceMenu = true; bool forceMenu = true;
auto res = getFileContent(AUTOBOOT_CONFIG_PATH); auto res = getFileContent(AUTOBOOT_CONFIG_PATH);
auto autobootIndex = -1; auto autobootIndex = -1;
@ -126,7 +125,6 @@ int main(int argc, char **argv) {
DEBUG_FUNCTION_LINE("Found environment %s from config at index %d", res.value().c_str(), i); DEBUG_FUNCTION_LINE("Found environment %s from config at index %d", res.value().c_str(), i);
autobootIndex = i; autobootIndex = i;
environment_path = environmentDirs.GetFilepath(i); environment_path = environmentDirs.GetFilepath(i);
foundFromConfig = true;
forceMenu = false; forceMenu = false;
break; break;
} }
@ -216,7 +214,10 @@ std::string EnvironmentSelectionScreen(const std::map<std::string, std::string>
uint32_t tvBufferSize = OSScreenGetBufferSizeEx(SCREEN_TV); uint32_t tvBufferSize = OSScreenGetBufferSizeEx(SCREEN_TV);
uint32_t drcBufferSize = OSScreenGetBufferSizeEx(SCREEN_DRC); uint32_t drcBufferSize = OSScreenGetBufferSizeEx(SCREEN_DRC);
uint8_t *screenBuffer = (uint8_t *) memalign(0x100, tvBufferSize + drcBufferSize); auto *screenBuffer = (uint8_t *) memalign(0x100, tvBufferSize + drcBufferSize);
if (!screenBuffer) {
OSFatal("Fail to allocate screenBuffer");
}
OSScreenSetBufferEx(SCREEN_TV, screenBuffer); OSScreenSetBufferEx(SCREEN_TV, screenBuffer);
OSScreenSetBufferEx(SCREEN_DRC, screenBuffer + tvBufferSize); OSScreenSetBufferEx(SCREEN_DRC, screenBuffer + tvBufferSize);
@ -227,15 +228,13 @@ std::string EnvironmentSelectionScreen(const std::map<std::string, std::string>
DrawUtils::initBuffers(screenBuffer, tvBufferSize, screenBuffer + tvBufferSize, drcBufferSize); DrawUtils::initBuffers(screenBuffer, tvBufferSize, screenBuffer + tvBufferSize, drcBufferSize);
DrawUtils::initFont(); DrawUtils::initFont();
uint32_t selected = 0; uint32_t selected = autobootIndex > 0 ? autobootIndex : 0;
int autoBoot = autobootIndex; int autoBoot = autobootIndex;
DEBUG_FUNCTION_LINE("Time to draw");
bool redraw = true; bool redraw = true;
while (true) { while (true) {
VPADStatus vpad{}; VPADStatus vpad{};
VPADRead(VPAD_CHAN_0, &vpad, 1, NULL); VPADRead(VPAD_CHAN_0, &vpad, 1, nullptr);
if (vpad.trigger & VPAD_BUTTON_UP) { if (vpad.trigger & VPAD_BUTTON_UP) {
if (selected > 0) { if (selected > 0) {