From 2b1c01080147bda717d7839d58fa931e22216936 Mon Sep 17 00:00:00 2001
From: Barry Harris <44396066+barry65536@users.noreply.github.com>
Date: Tue, 10 Apr 2012 19:47:24 +0000
Subject: [PATCH] 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

---
 src/burn/drv/capcom/cps.h        |  4 +---
 src/burn/drv/capcom/cps_draw.cpp |  4 +++-
 src/burn/drv/capcom/cps_scr.cpp  |  3 ---
 src/burn/drv/capcom/d_cps1.cpp   | 13 ++++++-------
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/burn/drv/capcom/cps.h b/src/burn/drv/capcom/cps.h
index 4d77d8e13..638742717 100644
--- a/src/burn/drv/capcom/cps.h
+++ b/src/burn/drv/capcom/cps.h
@@ -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;
diff --git a/src/burn/drv/capcom/cps_draw.cpp b/src/burn/drv/capcom/cps_draw.cpp
index 6077d4e6f..d6fabfdea 100644
--- a/src/burn/drv/capcom/cps_draw.cpp
+++ b/src/burn/drv/capcom/cps_draw.cpp
@@ -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:
diff --git a/src/burn/drv/capcom/cps_scr.cpp b/src/burn/drv/capcom/cps_scr.cpp
index b190262c5..881f07b57 100644
--- a/src/burn/drv/capcom/cps_scr.cpp
+++ b/src/burn/drv/capcom/cps_scr.cpp
@@ -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;
diff --git a/src/burn/drv/capcom/d_cps1.cpp b/src/burn/drv/capcom/d_cps1.cpp
index ec4a66bb1..5df33a848 100644
--- a/src/burn/drv/capcom/d_cps1.cpp
+++ b/src/burn/drv/capcom/d_cps1.cpp
@@ -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,