default the NoiseFreqTable to the NTSC one, to avoid cases where there might be NULL dereference
This commit is contained in:
parent
fa2a4a27fc
commit
090ce3201d
|
@ -103,7 +103,7 @@ static const uint32 NoiseFreqTablePAL[0x10] =
|
|||
236, 354, 472, 708, 944, 1890, 3778
|
||||
};
|
||||
|
||||
static const uint32 *NoiseFreqTable;
|
||||
static const uint32 *NoiseFreqTable = NoiseFreqTableNTSC;
|
||||
|
||||
static const uint32 NTSCDMCTable[0x10]=
|
||||
{
|
||||
|
@ -973,12 +973,20 @@ DECLFW(Write_IRQFM)
|
|||
FrameSoundUpdate();
|
||||
fcnt=1;
|
||||
fhcnt=fhinc;
|
||||
<<<<<<< .mine
|
||||
if (V & 0x01)
|
||||
{
|
||||
X6502_IRQEnd(FCEU_IQFCOUNT);
|
||||
SIRQStat&=~0x40;
|
||||
}
|
||||
=======
|
||||
//X6502_IRQEnd(FCEU_IQFCOUNT);
|
||||
if (V & 0x1)
|
||||
{
|
||||
X6502_IRQEnd(FCEU_IQFCOUNT);
|
||||
SIRQStat&=~0x40;
|
||||
}
|
||||
>>>>>>> .r1322
|
||||
IRQFrameMode=V;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue