Add variable to disable CPS-1 BgHi, change mercs, qad, sf2jc to use it rather than game specific variables, add it to FcrashInit, fcrash now working expect sound

This commit is contained in:
Barry Harris 2012-04-10 19:47:24 +00:00
parent 7f8e72dfee
commit 2b1c010801
4 changed files with 10 additions and 14 deletions

View File

@ -244,6 +244,7 @@ extern INT32 CpsLayer3XOffs;
extern INT32 CpsLayer1YOffs;
extern INT32 CpsLayer2YOffs;
extern INT32 CpsLayer3YOffs;
extern INT32 Cps1DisableBgHi;
void DrawFnInit();
INT32 CpsDraw();
INT32 CpsRedraw();
@ -335,10 +336,7 @@ INT32 FcrashObjDraw(INT32 nLevelFrom,INT32 nLevelTo);
#define SCROLL_2 0
#define SCROLL_3 1
extern INT32 Ghouls;
extern INT32 Mercs;
extern INT32 Sf2jc;
extern INT32 Ssf2t;
extern INT32 Qad;
extern INT32 Xmcota;
extern INT32 Scroll1TileMask;

View File

@ -18,6 +18,8 @@ INT32 CpsLayer1YOffs = 0;
INT32 CpsLayer2YOffs = 0;
INT32 CpsLayer3YOffs = 0;
INT32 Cps1DisableBgHi = 0;
static void Cps1Layers();
static void Cps2Layers();
@ -249,7 +251,7 @@ static void Cps1Layers()
if (n==0) {
if (nDrawMask & 1) CpsObjDrawDoX(0,7);
if (!Mercs && !Sf2jc && !Qad) {
if (!Cps1DisableBgHi) {
nBgHi=1;
switch (Draw[i+1]) {
case 1:

View File

@ -5,10 +5,7 @@
// Base = 0x4000 long tile map
// sx=Scroll X value, sy=Scroll Y value,
INT32 Ghouls=0;
INT32 Mercs=0;
INT32 Sf2jc=0;
INT32 Ssf2t=0;
INT32 Qad=0;
INT32 Xmcota=0;
INT32 Scroll1TileMask = 0;

View File

@ -11147,6 +11147,7 @@ static INT32 FcrashInit()
{
Cps1DisablePSnd = 1;
bCpsUpdatePalEveryFrame = 1;
Cps1DisableBgHi = 1;
CpsLayer1XOffs = -0x3f;
CpsLayer2XOffs = -0x3c;
CpsLayer3XOffs = 0xffc0;
@ -11281,7 +11282,7 @@ static INT32 KodhInit()
static INT32 MercsInit()
{
Mercs = 1;
Cps1DisableBgHi = 1;
return DrvInit();
}
@ -11358,7 +11359,7 @@ static INT32 Punipic3Init()
static INT32 QadInit()
{
Qad = 1;
Cps1DisableBgHi = 1;
return TwelveMhzInit();
}
@ -11382,7 +11383,7 @@ static INT32 Sf2ebblInit()
static INT32 Sf2jcInit()
{
Sf2jc = 1;
Cps1DisableBgHi = 1;
return DrvInit();
}
@ -12384,11 +12385,9 @@ static INT32 DrvExit()
Forgottn = 0;
Ghouls = 0;
Kodb = 0;
Mercs = 0;
PangEEP = 0;
Qad = 0;
Sf2jc = 0;
Cps1LockSpriteList910000 = 0;
Cps1DisableBgHi = 0;
Dinopic = 0;
Dinohunt = 0;
Sf2thndr = 0;
@ -12857,7 +12856,7 @@ struct BurnDriver BurnDrvCpsFfightjh = {
struct BurnDriver BurnDrvCpsFcrash = {
"fcrash", "ffight", NULL, NULL, "1990",
"Final Crash (bootleg)\0", NULL, "Playmark", "CPS1",
"Final Crash (bootleg)\0", "No sound", "Playmark", "CPS1",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_CAPCOM_CPS1, GBF_SCRFIGHT, 0,
NULL, FcrashRomInfo, FcrashRomName, NULL, NULL, FfightInputInfo, FfightDIPInfo,