ShuriZma
/
fbneo
mirror of https://github.com/finalburnneo/FBNeo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove obselete BgHi hack from CPS-1 driver

This commit is contained in:
Barry Harris 2012-04-09 19:23:32 +00:00
parent 66b9a40b0e
commit 7ae501470a
4 changed files with 7 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/burn/drv/capcom/cps.h
View File

@ -329,10 +329,7 @@ INT32 Cps2ObjDraw(INT32 nLevelFrom,INT32 nLevelTo);
#define SCROLL_2 0 #define SCROLL_2 0
#define SCROLL_3 1 #define SCROLL_3 1
extern INT32 Ghouls; extern INT32 Ghouls;
extern INT32 Mercs;
extern INT32 Sf2jc;
extern INT32 Ssf2t; extern INT32 Ssf2t;
extern INT32 Qad;
extern INT32 Xmcota; extern INT32 Xmcota;
extern INT32 Scroll1TileMask; extern INT32 Scroll1TileMask;

3
src/burn/drv/capcom/cps_draw.cpp
View File

@ -248,8 +248,6 @@ static void Cps1Layers()
if (n==0) { if (n==0) {
if (nDrawMask & 1) CpsObjDrawDoX(0,7); if (nDrawMask & 1) CpsObjDrawDoX(0,7);
if (!Mercs && !Sf2jc && !Qad) {
nBgHi=1; nBgHi=1;
switch (Draw[i+1]) { switch (Draw[i+1]) {
case 1: case 1:
@ -263,7 +261,6 @@ static void Cps1Layers()
break; break;
} }
nBgHi=0; nBgHi=0;
}
} }
// Then Draw the scroll layer on top // Then Draw the scroll layer on top

3
src/burn/drv/capcom/cps_scr.cpp
View File

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

38
src/burn/drv/capcom/d_cps1.cpp
View File

@ -11156,13 +11156,6 @@ static INT32 KodhInit()
return DrvInit(); return DrvInit();
} }
static INT32 MercsInit()
{
Mercs = 1;
return DrvInit();
}
static INT32 Pang3bInit() static INT32 Pang3bInit()
{ {
PangEEP = 1; PangEEP = 1;
@ -11233,13 +11226,6 @@ static INT32 Punipic3Init()
return nRet; return nRet;
} }
static INT32 QadInit()
{
Qad = 1;
return TwelveMhzInit();
}
static INT32 Sf2ebblInit() static INT32 Sf2ebblInit()
{ {
INT32 nRet = DrvInit(); INT32 nRet = DrvInit();
@ -11257,13 +11243,6 @@ static INT32 Sf2ebblInit()
return nRet; return nRet;
} }
static INT32 Sf2jcInit()
{
Sf2jc = 1;
return DrvInit();
}
static void Sf2qp1Callback() static void Sf2qp1Callback()
{ {
UINT8 *TempRom = (UINT8*)BurnMalloc(0x100000); UINT8 *TempRom = (UINT8*)BurnMalloc(0x100000);
@ -12261,10 +12240,7 @@ static INT32 DrvExit()
Forgottn = 0; Forgottn = 0;
Ghouls = 0; Ghouls = 0;
Kodb = 0; Kodb = 0;
Mercs = 0;
PangEEP = 0; PangEEP = 0;
Qad = 0;
Sf2jc = 0;
Cps1LockSpriteList910000 = 0; Cps1LockSpriteList910000 = 0;
Dinopic = 0; Dinopic = 0;
Dinohunt = 0; Dinohunt = 0;
@ -13048,7 +13024,7 @@ struct BurnDriver BurnDrvCpsMercs = {
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL, 3, HARDWARE_CAPCOM_CPS1, GBF_VERSHOOT, 0, BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL, 3, HARDWARE_CAPCOM_CPS1, GBF_VERSHOOT, 0,
NULL, MercsRomInfo, MercsRomName, NULL, NULL, MercsInputInfo, MercsDIPInfo, NULL, MercsRomInfo, MercsRomName, NULL, NULL, MercsInputInfo, MercsDIPInfo,
MercsInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, DrvInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan,
&CpsRecalcPal, 0x1000, 224, 384, 3, 4 &CpsRecalcPal, 0x1000, 224, 384, 3, 4
}; };
@ -13058,7 +13034,7 @@ struct BurnDriver BurnDrvCpsMercsu = {
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 3, HARDWARE_CAPCOM_CPS1, GBF_VERSHOOT, 0, BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 3, HARDWARE_CAPCOM_CPS1, GBF_VERSHOOT, 0,
NULL, MercsuRomInfo, MercsuRomName, NULL, NULL, MercsInputInfo, MercsDIPInfo, NULL, MercsuRomInfo, MercsuRomName, NULL, NULL, MercsInputInfo, MercsDIPInfo,
MercsInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, DrvInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan,
&CpsRecalcPal, 0x1000, 224, 384, 3, 4 &CpsRecalcPal, 0x1000, 224, 384, 3, 4
}; };
@ -13068,7 +13044,7 @@ struct BurnDriver BurnDrvCpsMercsur1 = {
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 3, HARDWARE_CAPCOM_CPS1, GBF_VERSHOOT, 0, BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 3, HARDWARE_CAPCOM_CPS1, GBF_VERSHOOT, 0,
NULL, Mercsur1RomInfo, Mercsur1RomName, NULL, NULL, MercsInputInfo, MercsDIPInfo, NULL, Mercsur1RomInfo, Mercsur1RomName, NULL, NULL, MercsInputInfo, MercsDIPInfo,
MercsInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, DrvInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan,
&CpsRecalcPal, 0x1000, 224, 384, 3, 4 &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, 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, BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 3, HARDWARE_CAPCOM_CPS1, GBF_VERSHOOT, 0,
NULL, MercsjRomInfo, MercsjRomName, NULL, NULL, MercsInputInfo, MercsDIPInfo, NULL, MercsjRomInfo, MercsjRomName, NULL, NULL, MercsInputInfo, MercsDIPInfo,
MercsInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, DrvInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan,
&CpsRecalcPal, 0x1000, 224, 384, 3, 4 &CpsRecalcPal, 0x1000, 224, 384, 3, 4
}; };
@ -13288,7 +13264,7 @@ struct BurnDriver BurnDrvCpsQad = {
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
BDF_GAME_WORKING, 2, HARDWARE_CAPCOM_CPS1, GBF_QUIZ, 0, BDF_GAME_WORKING, 2, HARDWARE_CAPCOM_CPS1, GBF_QUIZ, 0,
NULL, QadRomInfo, QadRomName, NULL, NULL, QadInputInfo, QadDIPInfo, NULL, QadRomInfo, QadRomName, NULL, NULL, QadInputInfo, QadDIPInfo,
QadInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, TwelveMhzInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan,
&CpsRecalcPal, 0x1000, 384, 224, 4, 3 &CpsRecalcPal, 0x1000, 384, 224, 4, 3
}; };
@ -13298,7 +13274,7 @@ struct BurnDriver BurnDrvCpsQadj = {
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_CAPCOM_CPS1, GBF_QUIZ, 0, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_CAPCOM_CPS1, GBF_QUIZ, 0,
NULL, QadjRomInfo, QadjRomName, NULL, NULL, QadInputInfo, QadjDIPInfo, NULL, QadjRomInfo, QadjRomName, NULL, NULL, QadInputInfo, QadjDIPInfo,
QadInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, TwelveMhzInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan,
&CpsRecalcPal, 0x1000, 384, 224, 4, 3 &CpsRecalcPal, 0x1000, 384, 224, 4, 3
}; };
@ -13468,7 +13444,7 @@ struct BurnDriver BurnDrvCpsSf2jc = {
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_CAPCOM_CPS1, GBF_VSFIGHT, FBF_SF, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_CAPCOM_CPS1, GBF_VSFIGHT, FBF_SF,
NULL, Sf2jcRomInfo, Sf2jcRomName, NULL, NULL, Sf2InputInfo, Sf2jDIPInfo, NULL, Sf2jcRomInfo, Sf2jcRomName, NULL, NULL, Sf2InputInfo, Sf2jDIPInfo,
Sf2jcInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan, DrvInit, DrvExit, Cps1Frame, CpsRedraw, CpsAreaScan,
&CpsRecalcPal, 0x1000, 384, 224, 4, 3 &CpsRecalcPal, 0x1000, 384, 224, 4, 3
}; };