ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed crash when four-screen bit is set after CRC check

This commit is contained in:
CaH4e3 2012-12-18 15:34:04 +00:00
parent 8110346ccb
commit 66b0073666
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ines.cpp
View File

@ -743,7 +743,6 @@ int iNESLoad(const char *name, FCEUFILE *fp, int OverwriteVidMode) {
if (head.ROM_type & 8) { if (head.ROM_type & 8) {
Mirroring = 2; Mirroring = 2;
ExtraNTARAM = (uint8*)FCEU_gmalloc(2048);
} }
if ((ROM = (uint8*)FCEU_malloc(ROM_size << 14)) == NULL) if ((ROM = (uint8*)FCEU_malloc(ROM_size << 14)) == NULL)
@ -832,9 +831,10 @@ int iNESLoad(const char *name, FCEUFILE *fp, int OverwriteVidMode) {
if (VROM_size) if (VROM_size)
SetupCartCHRMapping(0, VROM, VROM_size * 0x2000, 0); SetupCartCHRMapping(0, VROM, VROM_size * 0x2000, 0);
if (Mirroring == 2) if (Mirroring == 2) {
ExtraNTARAM = (uint8*)FCEU_gmalloc(2048);
SetupCartMirroring(4, 1, ExtraNTARAM); SetupCartMirroring(4, 1, ExtraNTARAM);
else if (Mirroring >= 0x10) } else if (Mirroring >= 0x10)
SetupCartMirroring(2 + (Mirroring & 1), 1, 0); SetupCartMirroring(2 + (Mirroring & 1), 1, 0);
else else
SetupCartMirroring(Mirroring & 1, (Mirroring & 4) >> 2, 0); SetupCartMirroring(Mirroring & 1, (Mirroring & 4) >> 2, 0);