diff --git a/src/burn/drv/capcom/cps.cpp b/src/burn/drv/capcom/cps.cpp index cbf5486fd..41ff4144b 100644 --- a/src/burn/drv/capcom/cps.cpp +++ b/src/burn/drv/capcom/cps.cpp @@ -3,7 +3,7 @@ INT32 Cps = 0; // 1 = CPS1, 2 = CPS2, 3 = CPS Changer INT32 Cps1Qs = 0; -INT32 Cps1Pic = 0; +INT32 Cps1DisablePSnd = 0; // Disables the Z80 as well INT32 nCPS68KClockspeed = 0; INT32 nCpsCycles = 0; // 68K Cycles per frame diff --git a/src/burn/drv/capcom/cps.h b/src/burn/drv/capcom/cps.h index 4e5893b51..ebe22eb82 100644 --- a/src/burn/drv/capcom/cps.h +++ b/src/burn/drv/capcom/cps.h @@ -16,7 +16,7 @@ extern UINT32 CpsBID[3]; // Board ID changes // cps.cpp extern INT32 Cps; // 1 = CPS1, 2 = CPS2, 3 = CPS CHanger extern INT32 Cps1Qs; -extern INT32 Cps1Pic; +extern INT32 Cps1DisablePSnd; extern INT32 nCPS68KClockspeed; extern INT32 nCpsCycles; // Cycles per frame extern INT32 nCpsZ80Cycles; diff --git a/src/burn/drv/capcom/cps_mem.cpp b/src/burn/drv/capcom/cps_mem.cpp index a25c4d1e5..093a2cf5d 100644 --- a/src/burn/drv/capcom/cps_mem.cpp +++ b/src/burn/drv/capcom/cps_mem.cpp @@ -101,7 +101,7 @@ void CpsMapObjectBanks(INT32 nBank) INT32 __fastcall CPSResetCallback() { // Reset instruction on 68000 - if (!Cps1Pic) ZetReset(); // Reset Z80 (CPU #1) + if (!Cps1DisablePSnd) ZetReset(); // Reset Z80 (CPU #1) return 0; } diff --git a/src/burn/drv/capcom/cps_run.cpp b/src/burn/drv/capcom/cps_run.cpp index bd908a58c..68d21ccb6 100644 --- a/src/burn/drv/capcom/cps_run.cpp +++ b/src/burn/drv/capcom/cps_run.cpp @@ -42,7 +42,7 @@ static INT32 DrvReset() SekReset(); SekClose(); - if (!Cps1Pic) { + if (!Cps1DisablePSnd) { ZetOpen(0); ZetReset(); ZetClose(); @@ -121,7 +121,7 @@ INT32 CpsRunInit() return 1; } - if ((Cps & 1) && Cps1Qs == 0 && Cps1Pic == 0) { // Sound init (MSM6295 + YM2151) + if ((Cps & 1) && Cps1Qs == 0 && Cps1DisablePSnd == 0) { // Sound init (MSM6295 + YM2151) if (PsndInit()) { return 1; } @@ -154,7 +154,7 @@ INT32 CpsRunExit() // Sound exit if (Cps == 2 || Cps1Qs == 1) QsndExit(); - if (Cps != 2 && Cps1Qs == 0 && !Cps1Pic) PsndExit(); + if (Cps != 2 && Cps1Qs == 0 && !Cps1DisablePSnd) PsndExit(); // Graphics exit CpsObjExit(); @@ -264,7 +264,7 @@ INT32 Cps1Frame() if (Cps1Qs == 1) { QsndNewFrame(); } else { - if (!Cps1Pic) { + if (!Cps1DisablePSnd) { ZetOpen(0); PsndNewFrame(); } @@ -309,7 +309,7 @@ INT32 Cps1Frame() if (Cps1Qs == 1) { QsndEndFrame(); } else { - if (!Cps1Pic) { + if (!Cps1DisablePSnd) { PsndSyncZ80(nCpsZ80Cycles); PsmUpdate(nBurnSoundLen); ZetClose(); diff --git a/src/burn/drv/capcom/d_cps1.cpp b/src/burn/drv/capcom/d_cps1.cpp index c223b00bb..c4168d574 100644 --- a/src/burn/drv/capcom/d_cps1.cpp +++ b/src/burn/drv/capcom/d_cps1.cpp @@ -10560,7 +10560,7 @@ static INT32 Cps1LoadRoms(INT32 bLoad) if (Cps1Qs) nCpsZRomLen *= 2; if (GameHasStars) nCpsGfxLen += 0x2000; if (PangEEP) nCpsGfxLen *= 2; - if (nCpsPicRomNum) Cps1Pic = 1; + if (nCpsPicRomNum) Cps1DisablePSnd = 1; #if 1 && defined FBA_DEBUG if (nCpsRomLen) bprintf(PRINT_IMPORTANT, _T("68K Rom Length %06X, (%i roms byteswapped, %i roms not byteswapped)\n"), nCpsRomLen, nCps68KByteswapRomNum, nCps68KNoByteswapRomNum); @@ -10954,7 +10954,7 @@ static INT32 DinohbInit() INT32 nRet = 0; Dinopic = 1; - Cps1Pic = 1; + Cps1DisablePSnd = 1; CpsDrawSpritesInReverse = 1; nRet = TwelveMhzInit(); @@ -11165,7 +11165,7 @@ static INT32 Punipic3Init() { INT32 nRet = 0; - Cps1Pic = 1; + Cps1DisablePSnd = 1; nRet = TwelveMhzInit(); @@ -12148,7 +12148,7 @@ static INT32 DrvExit() Cps = 0; Cps1Qs = 0; - Cps1Pic = 0; + Cps1DisablePSnd = 0; Forgottn = 0; Ghouls = 0; Kodb = 0;