diff --git a/builds/genesis_plus_gx_libretro.dll b/builds/genesis_plus_gx_libretro.dll index 8478c097..4f57d4a2 100644 Binary files a/builds/genesis_plus_gx_libretro.dll and b/builds/genesis_plus_gx_libretro.dll differ diff --git a/builds/genplus_cube.dol b/builds/genplus_cube.dol index 09921a7b..9176c2d8 100644 Binary files a/builds/genplus_cube.dol and b/builds/genplus_cube.dol differ diff --git a/builds/genplus_wii.dol b/builds/genplus_wii.dol index 952ad00f..47fdd66e 100644 Binary files a/builds/genplus_wii.dol and b/builds/genplus_wii.dol differ diff --git a/core/cd_hw/cdd.c b/core/cd_hw/cdd.c index 96b98ccf..99e17cd9 100644 --- a/core/cd_hw/cdd.c +++ b/core/cd_hw/cdd.c @@ -625,6 +625,7 @@ int cdd_load(char *filename, char *header) if (fd) { int mm, ss, bb, pregap = 0; + int index = 0; /* DATA track already loaded ? */ if (cdd.toc.last) @@ -806,27 +807,30 @@ int cdd_load(char *filename, char *header) cdd.toc.tracks[cdd.toc.last - 1].end = 0; } } + + /* save current track index */ + index = cdd.toc.last; } /* decode REM LOOP xxx command (MegaSD specific command) */ else if (sscanf(lptr, "REM LOOP %d", &bb) == 1) { - cdd.toc.tracks[cdd.toc.last].loopEnabled = 1; - cdd.toc.tracks[cdd.toc.last].loopOffset = bb; + cdd.toc.tracks[index].loopEnabled = 1; + cdd.toc.tracks[index].loopOffset = bb; isMSDfile = 1; } /* decode REM LOOP command (MegaSD specific command) */ else if (strstr(lptr,"REM LOOP")) { - cdd.toc.tracks[cdd.toc.last].loopEnabled = 1; + cdd.toc.tracks[index].loopEnabled = 1; isMSDfile = 1; } /* decode REM NOLOOP command (MegaSD specific command) */ else if (strstr(lptr,"REM NOLOOP")) { - cdd.toc.tracks[cdd.toc.last].loopEnabled = -1; + cdd.toc.tracks[index].loopEnabled = -1; isMSDfile = 1; } diff --git a/core/loadrom.c b/core/loadrom.c index 2635d446..1690dfba 100644 --- a/core/loadrom.c +++ b/core/loadrom.c @@ -1072,6 +1072,7 @@ void get_region(char *romheader) (strstr(rominfo.product,"T-69046-50") != NULL) || /* Back to the Future III (Europe) */ (strstr(rominfo.product,"T-120106-00") != NULL) || /* Brian Lara Cricket (Europe) */ (strstr(rominfo.product,"T-97126 -50") != NULL) || /* Williams Arcade's Greatest Hits (Europe) */ + (strstr(rominfo.product,"T-113026-50") != NULL) || /* Wiz'n'Liz - The Frantic Wabbit Wescue (Europe) */ (strstr(rominfo.product,"T-70096 -00") != NULL) || /* Muhammad Ali Heavyweight Boxing (Europe) */ ((rominfo.checksum == 0x0000) && (rominfo.realchecksum == 0x1f7f))) /* Radica - Sensible Soccer Plus edition */ { diff --git a/libretro/libretro_msvc/genesis_plus_gx_libretro.vcxproj b/libretro/libretro_msvc/genesis_plus_gx_libretro.vcxproj index ff11a280..e2db67e0 100644 --- a/libretro/libretro_msvc/genesis_plus_gx_libretro.vcxproj +++ b/libretro/libretro_msvc/genesis_plus_gx_libretro.vcxproj @@ -154,6 +154,7 @@ + @@ -258,6 +259,7 @@ + diff --git a/libretro/libretro_msvc/genesis_plus_gx_libretro.vcxproj.filters b/libretro/libretro_msvc/genesis_plus_gx_libretro.vcxproj.filters index c1834dcb..54cafff6 100644 --- a/libretro/libretro_msvc/genesis_plus_gx_libretro.vcxproj.filters +++ b/libretro/libretro_msvc/genesis_plus_gx_libretro.vcxproj.filters @@ -294,6 +294,9 @@ core\cart_hw + + core\cart_hw + core\cart_hw @@ -668,6 +671,9 @@ core\cart_hw + + core\cart_hw + core\cart_hw diff --git a/sdl/gx_vstudio/gx_vstudio.vcxproj b/sdl/gx_vstudio/gx_vstudio.vcxproj index 8616eea0..787536c0 100644 --- a/sdl/gx_vstudio/gx_vstudio.vcxproj +++ b/sdl/gx_vstudio/gx_vstudio.vcxproj @@ -159,6 +159,7 @@ + @@ -307,6 +308,7 @@ + diff --git a/sdl/gx_vstudio/gx_vstudio.vcxproj.filters b/sdl/gx_vstudio/gx_vstudio.vcxproj.filters index 78ba0e2b..a9ec7207 100644 --- a/sdl/gx_vstudio/gx_vstudio.vcxproj.filters +++ b/sdl/gx_vstudio/gx_vstudio.vcxproj.filters @@ -168,6 +168,9 @@ includes\core\cart_hw + + includes\core\cart_hw + includes\core\cart_hw @@ -604,6 +607,9 @@ src\core\cart_hw + + src\core\cart_hw + src\core\cart_hw