The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-11-27 13:44:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

- cleaned up code for game config load.

Browse Source
This commit is contained in:
Fledge68 2020-06-26 15:16:21 -05:00
parent ca35893058
commit a9828f0dc5
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/loader/fst.c
View File

@ -114,7 +114,8 @@ int app_gameconfig_load(const char *discid, u8 *tempgameconf, u32 tempgameconfsi
else if (tempgameconf[i] == ' ') else if (tempgameconf[i] == ' ')
break; break;
else i++; else i++;
if (parsebufpos == 8) break; if (parsebufpos == 8)
break;
} }
parsebuffer[parsebufpos] = 0; parsebuffer[parsebufpos] = 0;
if (strncasecmp("DEFAULT", parsebuffer, strlen(parsebuffer)) == 0 && strlen(parsebuffer) == 7) if (strncasecmp("DEFAULT", parsebuffer, strlen(parsebuffer)) == 0 && strlen(parsebuffer) == 7)
@ -138,19 +139,18 @@ int app_gameconfig_load(const char *discid, u8 *tempgameconf, u32 tempgameconfsi
parsebufpos = 0; parsebufpos = 0;
while ((i != tempgameconfsize) && (tempgameconf[i] != 10 && tempgameconf[i] != 13)) while ((i != tempgameconfsize) && (tempgameconf[i] != 10 && tempgameconf[i] != 13))
{ {
if (tempgameconf[i] != 0 && tempgameconf[i] != ' ' && tempgameconf[i] != '(' && tempgameconf[i] if (tempgameconf[i] != 0 && tempgameconf[i] != ' ' && tempgameconf[i] != '(' && tempgameconf[i] != ':')
!= ':')
parsebuffer[parsebufpos++] = tempgameconf[i++]; parsebuffer[parsebufpos++] = tempgameconf[i++];
else if (tempgameconf[i] == ' ' || tempgameconf[i] == '(' || tempgameconf[i] == ':') else if (tempgameconf[i] == ' ' || tempgameconf[i] == '(' || tempgameconf[i] == ':')
break; break;
else i++; else i++;
if (parsebufpos == 17) break; if (parsebufpos == 17)
break;
} }
parsebuffer[parsebufpos] = 0; parsebuffer[parsebufpos] = 0;
//if (!autobootcheck) //if (!autobootcheck)
{ {
if (strncasecmp("codeliststart", parsebuffer, strlen(parsebuffer)) == 0 && strlen(parsebuffer) if (strncasecmp("codeliststart", parsebuffer, strlen(parsebuffer)) == 0 && strlen(parsebuffer) == 13)
== 13)
{ {
sscanf((char *) (tempgameconf + i), " = %x", (unsigned int *) &codelist); sscanf((char *) (tempgameconf + i), " = %x", (unsigned int *) &codelist);
} }
@ -176,8 +176,7 @@ int app_gameconfig_load(const char *discid, u8 *tempgameconf, u32 tempgameconfsi
} }
if (strncasecmp("pokeifequal", parsebuffer, strlen(parsebuffer)) == 0 && strlen(parsebuffer) == 11) if (strncasecmp("pokeifequal", parsebuffer, strlen(parsebuffer)) == 0 && strlen(parsebuffer) == 11)
{ {
ret = sscanf((char *) (tempgameconf + i), "( %lx , %lx , %lx , %lx", &codeaddr, &codeval, ret = sscanf((char *) (tempgameconf + i), "( %lx , %lx , %lx , %lx", &codeaddr, &codeval, &codeaddr2, &codeval2);
&codeaddr2, &codeval2);
if (ret == 4) if (ret == 4)
{ {
*(gameconf + (gameconfsize / 4)) = 0; *(gameconf + (gameconfsize / 4)) = 0;
@ -193,8 +192,7 @@ int app_gameconfig_load(const char *discid, u8 *tempgameconf, u32 tempgameconfsi
DCFlushRange((void *) (gameconf + (gameconfsize / 4) - 5), 20); DCFlushRange((void *) (gameconf + (gameconfsize / 4) - 5), 20);
} }
} }
if (strncasecmp("searchandpoke", parsebuffer, strlen(parsebuffer)) == 0 && strlen(parsebuffer) if (strncasecmp("searchandpoke", parsebuffer, strlen(parsebuffer)) == 0 && strlen(parsebuffer) == 13)
== 13)
{ {
ret = sscanf((char *) (tempgameconf + i), "( %lx%ln", &codeval, &tempoffset); ret = sscanf((char *) (tempgameconf + i), "( %lx%ln", &codeval, &tempoffset);
if (ret == 1) if (ret == 1)
@ -210,8 +208,7 @@ int app_gameconfig_load(const char *discid, u8 *tempgameconf, u32 tempgameconfsi
ret = sscanf((char *) (tempgameconf + i), " %lx%ln", &codeval, &tempoffset); ret = sscanf((char *) (tempgameconf + i), " %lx%ln", &codeval, &tempoffset);
} }
*(gameconf + (gameconfsize / 4) - temp - 1) = temp; *(gameconf + (gameconfsize / 4) - temp - 1) = temp;
ret = sscanf((char *) (tempgameconf + i), " , %lx , %lx , %lx , %lx", &codeaddr, &codeaddr2, ret = sscanf((char *) (tempgameconf + i), " , %lx , %lx , %lx , %lx", &codeaddr, &codeaddr2, &codeoffset, &codeval2);
&codeoffset, &codeval2);
if (ret == 4) if (ret == 4)
{ {
*(gameconf + (gameconfsize / 4)) = codeaddr; *(gameconf + (gameconfsize / 4)) = codeaddr;
@ -233,10 +230,12 @@ int app_gameconfig_load(const char *discid, u8 *tempgameconf, u32 tempgameconfsi
{ {
while ((i != tempgameconfsize) && (tempgameconf[i] != 10 && tempgameconf[i] != 13)) while ((i != tempgameconfsize) && (tempgameconf[i] != 10 && tempgameconf[i] != 13))
i++; i++;
if (i != tempgameconfsize) i++; if (i != tempgameconfsize)
i++;
} }
} }
if (i != tempgameconfsize) while ((tempgameconf[i] != 10 && tempgameconf[i] != 13) && (i != 0)) if (i != tempgameconfsize)
while ((tempgameconf[i] != 10 && tempgameconf[i] != 13) && (i != 0))
i--; i--;
} }
} }