Merge branch 'master' of https://github.com/86Box/86Box into feature/savquest

2021-08-03 21:45:54 -03:00
parent 61784ca9f4 b86c8086fb
commit 9d953623e5
13 changed files with 189 additions and 90 deletions
--- a/src/device/cartridge.c
+++ b/src/device/cartridge.c
@@ -128,6 +128,8 @@ cart_image_load(int drive, char *fn)
 	fclose(f);
    } else {
 	base = drive ? 0xe0000 : 0xd0000;
+	if (size == 32768)
+		base += 0x8000;
 	fseek(f, 0x00000000, SEEK_SET);
 	carts[drive].buf = (uint8_t *) malloc(size);
 	memset(carts[drive].buf, 0x00, size);