rvtr/GodMode9i
1
Fork 0
mirror of https://github.com/rvtr/GodMode9i.git synced 2025-11-02 00:11:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only access NitroFS if the drive within the ROM is mounted

Browse Source
This commit is contained in:
RocketRobz 2018-10-08 16:04:07 -06:00
parent e762497fba
commit 9d7f343cb4
1 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
arm9/source/driveMenu.cpp
View File

@ -121,7 +121,7 @@ void gbaCartDump(void) {
void driveMenu (void) { void driveMenu (void) {
int pressed = 0; int pressed = 0;
int held = 0; int held = 0;
int assignedOp[3] = {0}; int assignedOp[3] = {-1};
int maxCursors = -1; int maxCursors = -1;
while (true) { while (true) {
@ -140,13 +140,18 @@ void driveMenu (void) {
gbaFixedValue = *(u8*)(0x080000B2); gbaFixedValue = *(u8*)(0x080000B2);
} }
for (int i = 0; i < 3; i++) {
assignedOp[i] = -1;
}
maxCursors = -1; maxCursors = -1;
if (isDSiMode()){ if (isDSiMode() && sdMounted){
maxCursors++; maxCursors++;
assignedOp[maxCursors] = 0; assignedOp[maxCursors] = 0;
} }
maxCursors++; if (flashcardMounted) {
assignedOp[maxCursors] = 1; maxCursors++;
assignedOp[maxCursors] = 1;
}
if (!isDSiMode() && isRegularDS) { if (!isDSiMode() && isRegularDS) {
maxCursors++; maxCursors++;
assignedOp[maxCursors] = 2; assignedOp[maxCursors] = 2;
@ -156,6 +161,9 @@ void driveMenu (void) {
assignedOp[maxCursors] = 3; assignedOp[maxCursors] = 3;
} }
if (dmCursorPosition < 0) dmCursorPosition = maxCursors; // Wrap around to bottom of list
if (dmCursorPosition > maxCursors) dmCursorPosition = 0; // Wrap around to top of list
if (!dmTextPrinted) { if (!dmTextPrinted) {
consoleInit(NULL, 1, BgType_Text4bpp, BgSize_T_256x256, 15, 0, false, true); consoleInit(NULL, 1, BgType_Text4bpp, BgSize_T_256x256, 15, 0, false, true);
if (assignedOp[dmCursorPosition] == 0) { if (assignedOp[dmCursorPosition] == 0) {
@ -194,20 +202,16 @@ void driveMenu (void) {
// Show cursor // Show cursor
printf ("\x1b[%d;0H*", dmCursorPosition + ENTRIES_START_ROW); printf ("\x1b[%d;0H*", dmCursorPosition + ENTRIES_START_ROW);
if (maxCursors == -1) {
printf ("\x1b[2;1H");
printf ("No drives found!");
} else
for (int i = 0; i <= maxCursors; i++) { for (int i = 0; i <= maxCursors; i++) {
iprintf ("\x1b[%d;1H", i + ENTRIES_START_ROW); iprintf ("\x1b[%d;1H", i + ENTRIES_START_ROW);
if (assignedOp[i] == 0) { if (assignedOp[i] == 0) {
printf ("[sd:] SDCARD"); printf ("[sd:] SDCARD");
if (!sdMounted) {
iprintf ("\x1b[%d;29H", i + ENTRIES_START_ROW);
printf ("[x]");
}
} else if (assignedOp[i] == 1) { } else if (assignedOp[i] == 1) {
printf ("[fat:] GAMECART"); printf ("[fat:] GAMECART");
if (!flashcardMounted) {
iprintf ("\x1b[%d;29H", i + ENTRIES_START_ROW);
printf ("[x]");
}
} else if (assignedOp[i] == 2) { } else if (assignedOp[i] == 2) {
printf ("GBA GAMECART"); printf ("GBA GAMECART");
if (gbaFixedValue != 0x96) { if (gbaFixedValue != 0x96) {
@ -216,6 +220,12 @@ void driveMenu (void) {
} }
} else if (assignedOp[i] == 3) { } else if (assignedOp[i] == 3) {
printf ("[nitro:] NDS GAME IMAGE"); printf ("[nitro:] NDS GAME IMAGE");
if ((!sdMounted && !nitroSecondaryDrive)
|| (!flashcardMounted && nitroSecondaryDrive))
{
iprintf ("\x1b[%d;29H", i + ENTRIES_START_ROW);
printf ("[x]");
}
} }
} }
@ -257,7 +267,7 @@ void driveMenu (void) {
dmCursorPosition += 1; dmCursorPosition += 1;
dmTextPrinted = false; dmTextPrinted = false;
} }
if (dmCursorPosition < 0) dmCursorPosition = maxCursors; // Wrap around to bottom of list if (dmCursorPosition < 0) dmCursorPosition = maxCursors; // Wrap around to bottom of list
if (dmCursorPosition > maxCursors) dmCursorPosition = 0; // Wrap around to top of list if (dmCursorPosition > maxCursors) dmCursorPosition = 0; // Wrap around to top of list
@ -278,11 +288,15 @@ void driveMenu (void) {
dmTextPrinted = false; dmTextPrinted = false;
gbaCartDump(); gbaCartDump();
} else if (assignedOp[dmCursorPosition] == 3 && nitroMounted) { } else if (assignedOp[dmCursorPosition] == 3 && nitroMounted) {
dmTextPrinted = false; if ((sdMounted && !nitroSecondaryDrive)
secondaryDrive = nitroSecondaryDrive; || (flashcardMounted && nitroSecondaryDrive))
chdir("nitro:/"); {
screenMode = 1; dmTextPrinted = false;
break; secondaryDrive = nitroSecondaryDrive;
chdir("nitro:/");
screenMode = 1;
break;
}
} }
} }