The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-12-17 23:41:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

-fixed broken gamecube disc dumper and made single disc

Browse Source 
games installable again too
This commit is contained in:
fix94.1 2012-03-17 22:32:53 +00:00
parent 64773f440c
commit 02c58ebe04
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
source/loader/gc_disc.cpp
View File

@ -203,7 +203,7 @@ bool GCDump::__WaitForDisc(u8 dsc, u32 msg)
if(Disc_IsGC() == 0) if(Disc_IsGC() == 0)
{ {
s32 ret = __DiscReadRaw(ReadBuffer, 0+NextOffset, 0x440); s32 ret = __DiscReadRaw(ReadBuffer, NextOffset, 0x440);
if(ret > 0) if(ret > 0)
{ {
MEM2_free(ReadBuffer); MEM2_free(ReadBuffer);
@ -282,7 +282,7 @@ s32 GCDump::DumpGame()
{ {
multigamedisc = true; multigamedisc = true;
__AnalizeMultiDisc(); __AnalizeMultiDisc();
__DiscReadRaw(ReadBuffer, 0+NextOffset, sizeof(gc_discHdr)); __DiscReadRaw(ReadBuffer, NextOffset, sizeof(gc_discHdr));
memcpy(gcheader.id, ReadBuffer, 6); memcpy(gcheader.id, ReadBuffer, 6);
strcpy(gcheader.title, (char *)ReadBuffer+0x20); strcpy(gcheader.title, (char *)ReadBuffer+0x20);
} }
@ -310,7 +310,7 @@ s32 GCDump::DumpGame()
continue; continue;
} }
ret = __DiscReadRaw(ReadBuffer, 0+NextOffset, 0x440); ret = __DiscReadRaw(ReadBuffer, NextOffset, 0x440);
if(ret > 0) if(ret > 0)
{ {
MEM2_free(ReadBuffer); MEM2_free(ReadBuffer);
@ -378,7 +378,7 @@ s32 GCDump::DumpGame()
gprintf("Writing %s/boot.bin\n", folder); gprintf("Writing %s/boot.bin\n", folder);
snprintf(gamepath, sizeof(gamepath), "%s/boot.bin", folder); snprintf(gamepath, sizeof(gamepath), "%s/boot.bin", folder);
gc_done += __DiscWrite(gamepath, 0+NextOffset, 0x440, ReadBuffer); gc_done += __DiscWrite(gamepath, NextOffset, 0x440, ReadBuffer);
gprintf("Writing %s/bi2.bin\n", folder); gprintf("Writing %s/bi2.bin\n", folder);
snprintf(gamepath, sizeof(gamepath), "%s/bi2.bin", folder); snprintf(gamepath, sizeof(gamepath), "%s/bi2.bin", folder);
@ -401,7 +401,7 @@ s32 GCDump::DumpGame()
FILE *f; FILE *f;
f = fopen(gamepath, "wb"); f = fopen(gamepath, "wb");
ret = __DiscWriteFile(f, 0+NextOffset, (FSTOffset + FSTSize), ReadBuffer); ret = __DiscWriteFile(f, NextOffset, (FSTOffset + FSTSize), ReadBuffer);
wrote += (FSTOffset + FSTSize); wrote += (FSTOffset + FSTSize);
gc_done += wrote; gc_done += wrote;
@ -461,7 +461,7 @@ s32 GCDump::DumpGame()
} }
else else
{ {
ret = __DiscWrite(gamepath, 0+NextOffset, DiscSize, ReadBuffer); ret = __DiscWrite(gamepath, NextOffset, DiscSize, ReadBuffer);
if( ret < 0 ) if( ret < 0 )
{ {
MEM2_free(ReadBuffer); MEM2_free(ReadBuffer);
@ -486,7 +486,7 @@ s32 GCDump::DumpGame()
Disc++; Disc++;
} }
} }
else else if(multigamedisc)
{ {
if(MultiGameDump+1 == MultiGameCnt) if(MultiGameDump+1 == MultiGameCnt)
{ {
@ -498,6 +498,8 @@ s32 GCDump::DumpGame()
MultiGameDump++; MultiGameDump++;
} }
} }
else
gamedone = true;
} }
MEM2_free(ReadBuffer); MEM2_free(ReadBuffer);
@ -510,7 +512,7 @@ s32 GCDump::CheckSpace(u32 *needed, bool comp)
static gc_discHdr gcheader ATTRIBUTE_ALIGN(32); static gc_discHdr gcheader ATTRIBUTE_ALIGN(32);
u8 *ReadBuffer = (u8 *)MEM2_alloc(0x440); u8 *ReadBuffer = (u8 *)MEM2_alloc(0x440);
u32 size = 0; u32 size = 0;
bool scnddisc = false; bool scnddisc = false;
gamedone = false; gamedone = false;
multigamedisc = false; multigamedisc = false;
@ -520,7 +522,7 @@ s32 GCDump::CheckSpace(u32 *needed, bool comp)
Disc = 0; Disc = 0;
while(!gamedone) while(!gamedone)
{ {
u32 multisize = 0; u32 multisize = 0;
Disc_ReadGCHeader(&gcheader); Disc_ReadGCHeader(&gcheader);
@ -528,14 +530,14 @@ s32 GCDump::CheckSpace(u32 *needed, bool comp)
{ {
multigamedisc = true; multigamedisc = true;
__AnalizeMultiDisc(); __AnalizeMultiDisc();
__DiscReadRaw(ReadBuffer, 0+NextOffset, sizeof(gc_discHdr)); __DiscReadRaw(ReadBuffer, NextOffset, sizeof(gc_discHdr));
memcpy(gcheader.id, ReadBuffer, sizeof(gcheader.id)); memcpy(gcheader.id, ReadBuffer, sizeof(gcheader.id));
strcpy(gcheader.title, (char *)ReadBuffer+0x20); strcpy(gcheader.title, (char *)ReadBuffer+0x20);
} }
Asciify2(gcheader.title); Asciify2(gcheader.title);
s32 ret = __DiscReadRaw(ReadBuffer, 0+NextOffset, 0x440); s32 ret = __DiscReadRaw(ReadBuffer, NextOffset, 0x440);
if(ret > 0) if(ret > 0)
{ {
MEM2_free(ReadBuffer); MEM2_free(ReadBuffer);
@ -602,7 +604,7 @@ s32 GCDump::CheckSpace(u32 *needed, bool comp)
if((fst[i].FileOffset & (align-1)) == 0 || force_32k_align) if((fst[i].FileOffset & (align-1)) == 0 || force_32k_align)
{ {
correction = 0; correction = 0;
while(((size+correction) & (align-1)) != 0) while(((multisize+correction) & (align-1)) != 0)
correction++; correction++;
multisize += correction; multisize += correction;
break; break;
@ -618,22 +620,22 @@ s32 GCDump::CheckSpace(u32 *needed, bool comp)
if(FSTTotal > FSTSize && !multigamedisc) if(FSTTotal > FSTSize && !multigamedisc)
{ {
if(Disc == 0 && !scnddisc) if(Disc == 0 && !scnddisc)
__WaitForDisc(1, 1); __WaitForDisc(1, 1);
else if(Disc == 0x01 && !scnddisc) else if(Disc == 0x01 && !scnddisc)
__WaitForDisc(0, 1); __WaitForDisc(0, 1);
if(scnddisc) if(scnddisc)
{ {
if(Disc == 0x01) if(Disc == 0x01)
__WaitForDisc(0, 1); __WaitForDisc(0, 1);
gamedone = true; gamedone = true;
break; break;
} }
scnddisc = true; scnddisc = true;
} }
else else if(multigamedisc)
{ {
if(MultiGameDump+1 == MultiGameCnt) if(MultiGameDump+1 == MultiGameCnt)
{ {
@ -644,7 +646,9 @@ s32 GCDump::CheckSpace(u32 *needed, bool comp)
{ {
MultiGameDump++; MultiGameDump++;
} }
} }
else
gamedone = true;
} }
MEM2_free(ReadBuffer); MEM2_free(ReadBuffer);
DiscSizeCalculated = size/0x400; DiscSizeCalculated = size/0x400;