From 7ae501470abb8809ec317fcf7404203f14d2441f Mon Sep 17 00:00:00 2001 From: Barry Harris <44396066+barry65536@users.noreply.github.com> Date: Mon, 9 Apr 2012 19:23:32 +0000 Subject: [PATCH] Remove obselete BgHi hack from CPS-1 driver --- src/burn/drv/capcom/cps.h | 3 --- src/burn/drv/capcom/cps_draw.cpp | 3 --- src/burn/drv/capcom/cps_scr.cpp | 3 --- src/burn/drv/capcom/d_cps1.cpp | 38 ++++++-------------------------- 4 files changed, 7 insertions(+), 40 deletions(-) diff --git a/src/burn/drv/capcom/cps.h b/src/burn/drv/capcom/cps.h index a9736bb98..ca6bf4cac 100644 --- a/src/burn/drv/capcom/cps.h +++ b/src/burn/drv/capcom/cps.h @@ -329,10 +329,7 @@ INT32 Cps2ObjDraw(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..bffb09df2 100644 --- a/src/burn/drv/capcom/cps_draw.cpp +++ b/src/burn/drv/capcom/cps_draw.cpp @@ -248,8 +248,6 @@ static void Cps1Layers() if (n==0) { if (nDrawMask & 1) CpsObjDrawDoX(0,7); - - if (!Mercs && !Sf2jc && !Qad) { nBgHi=1; switch (Draw[i+1]) { case 1: @@ -263,7 +261,6 @@ static void Cps1Layers() break; } nBgHi=0; - } } // Then Draw the scroll layer on top 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 e2304b525..0b4f6fa54 100644 --- a/src/burn/drv/capcom/d_cps1.cpp +++ b/src/burn/drv/capcom/d_cps1.cpp @@ -11156,13 +11156,6 @@ static INT32 KodhInit() return DrvInit(); } -static INT32 MercsInit() -{ - Mercs = 1; - - return DrvInit(); -} - static INT32 Pang3bInit() { PangEEP = 1; @@ -11233,13 +11226,6 @@ static INT32 Punipic3Init() return nRet; } -static INT32 QadInit() -{ - Qad = 1; - - return TwelveMhzInit(); -} - static INT32 Sf2ebblInit() { INT32 nRet = DrvInit(); @@ -11257,13 +11243,6 @@ static INT32 Sf2ebblInit() return nRet; } -static INT32 Sf2jcInit() -{ - Sf2jc = 1; - - return DrvInit(); -} - static void Sf2qp1Callback() { UINT8 *TempRom = (UINT8*)BurnMalloc(0x100000); @@ -12261,10 +12240,7 @@ static INT32 DrvExit() Forgottn = 0; Ghouls = 0; Kodb = 0; - Mercs = 0; PangEEP = 0; - Qad = 0; - Sf2jc = 0; Cps1LockSpriteList910000 = 0; Dinopic = 0; Dinohunt = 0; @@ -13048,7 +13024,7 @@ struct BurnDriver BurnDrvCpsMercs = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL, 3, HARDWARE_CAPCOM_CPS1, GBF_VERSHOOT, 0, NULL, MercsRomInfo, MercsRomName, NULL, NULL, MercsInputInfo, MercsDIPInfo, - MercsInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, + DrvInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, &CpsRecalcPal, 0x1000, 224, 384, 3, 4 }; @@ -13058,7 +13034,7 @@ struct BurnDriver BurnDrvCpsMercsu = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 3, HARDWARE_CAPCOM_CPS1, GBF_VERSHOOT, 0, NULL, MercsuRomInfo, MercsuRomName, NULL, NULL, MercsInputInfo, MercsDIPInfo, - MercsInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, + DrvInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, &CpsRecalcPal, 0x1000, 224, 384, 3, 4 }; @@ -13068,7 +13044,7 @@ struct BurnDriver BurnDrvCpsMercsur1 = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 3, HARDWARE_CAPCOM_CPS1, GBF_VERSHOOT, 0, NULL, Mercsur1RomInfo, Mercsur1RomName, NULL, NULL, MercsInputInfo, MercsDIPInfo, - MercsInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, + DrvInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, &CpsRecalcPal, 0x1000, 224, 384, 3, 4 }; @@ -13078,7 +13054,7 @@ struct BurnDriver BurnDrvCpsMercsj = { L"\u6226\u5834\u306E\u72FC II\0Senjo no Ookami II (Ookami 2 900302 Japan)\0", NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 3, HARDWARE_CAPCOM_CPS1, GBF_VERSHOOT, 0, NULL, MercsjRomInfo, MercsjRomName, NULL, NULL, MercsInputInfo, MercsDIPInfo, - MercsInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, + DrvInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, &CpsRecalcPal, 0x1000, 224, 384, 3, 4 }; @@ -13288,7 +13264,7 @@ struct BurnDriver BurnDrvCpsQad = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_CAPCOM_CPS1, GBF_QUIZ, 0, NULL, QadRomInfo, QadRomName, NULL, NULL, QadInputInfo, QadDIPInfo, - QadInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, + TwelveMhzInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, &CpsRecalcPal, 0x1000, 384, 224, 4, 3 }; @@ -13298,7 +13274,7 @@ struct BurnDriver BurnDrvCpsQadj = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_CAPCOM_CPS1, GBF_QUIZ, 0, NULL, QadjRomInfo, QadjRomName, NULL, NULL, QadInputInfo, QadjDIPInfo, - QadInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, + TwelveMhzInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, &CpsRecalcPal, 0x1000, 384, 224, 4, 3 }; @@ -13468,7 +13444,7 @@ struct BurnDriver BurnDrvCpsSf2jc = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_CAPCOM_CPS1, GBF_VSFIGHT, FBF_SF, NULL, Sf2jcRomInfo, Sf2jcRomName, NULL, NULL, Sf2InputInfo, Sf2jDIPInfo, - Sf2jcInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, + DrvInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, &CpsRecalcPal, 0x1000, 384, 224, 4, 3 };