From 6b5b37691a18162d132a4489e6dc837091ac0e9e Mon Sep 17 00:00:00 2001 From: dinkc64 <12570148+dinkc64@users.noreply.github.com> Date: Wed, 6 Jun 2018 12:45:52 +0000 Subject: [PATCH] drv/taito/*: setup redraw for taito z,x,misc,bublbobl, and others --- src/burn/drv/taito/d_bublbobl.cpp | 54 +++++++------ src/burn/drv/taito/d_darius2.cpp | 39 +++++---- src/burn/drv/taito/d_othunder.cpp | 21 +++-- src/burn/drv/taito/d_slapshot.cpp | 31 ++----- src/burn/drv/taito/d_superchs.cpp | 10 ++- src/burn/drv/taito/d_taitob.cpp | 2 +- src/burn/drv/taito/d_taitoh.cpp | 10 +-- src/burn/drv/taito/d_taitomisc.cpp | 118 +++++++++++++-------------- src/burn/drv/taito/d_taitox.cpp | 24 +++--- src/burn/drv/taito/d_taitoz.cpp | 126 ++++++++++++++--------------- 10 files changed, 208 insertions(+), 227 deletions(-) diff --git a/src/burn/drv/taito/d_bublbobl.cpp b/src/burn/drv/taito/d_bublbobl.cpp index a7f229349..e5dd8145e 100644 --- a/src/burn/drv/taito/d_bublbobl.cpp +++ b/src/burn/drv/taito/d_bublbobl.cpp @@ -2808,7 +2808,7 @@ static void DrvVideoUpdate() } } -static void DrvDraw() +static INT32 DrvDraw() { for (INT32 i = 0; i < nScreenHeight * nScreenWidth; i++) { pTransDraw[i] = 0x00ff; @@ -2817,6 +2817,8 @@ static void DrvDraw() DrvCalcPalette(); DrvVideoUpdate(); BurnTransferCopy(DrvPalette); + + return 0; } static INT32 DrvFrame() @@ -3067,7 +3069,7 @@ struct BurnDriver BurnDrvBublbobl = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, BublboblRomInfo, BublboblRomName, NULL, NULL, BublboblInputInfo, BublboblDIPInfo, - BublboblInit, BublboblExit, DrvFrame, NULL, DrvScan, + BublboblInit, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3077,7 +3079,7 @@ struct BurnDriver BurnDrvBublboblu = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, BublbobluRomInfo, BublbobluRomName, NULL, NULL, BublboblInputInfo, BublboblDIPInfo, - BublboblInit, BublboblExit, DrvFrame, NULL, DrvScan, + BublboblInit, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3087,7 +3089,7 @@ struct BurnDriver BurnDrvBublbob1 = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, Bublbob1RomInfo, Bublbob1RomName, NULL, NULL, BublboblInputInfo, BublboblDIPInfo, - BublboblInit, BublboblExit, DrvFrame, NULL, DrvScan, + BublboblInit, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3097,7 +3099,7 @@ struct BurnDriver BurnDrvBublbobr = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, BublbobrRomInfo, BublbobrRomName, NULL, NULL, BublboblInputInfo, BublboblDIPInfo, - BublboblInit, BublboblExit, DrvFrame, NULL, DrvScan, + BublboblInit, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3107,7 +3109,7 @@ struct BurnDriver BurnDrvBubbobr1 = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, Bubbobr1RomInfo, Bubbobr1RomName, NULL, NULL, BublboblInputInfo, BublboblDIPInfo, - BublboblInit, BublboblExit, DrvFrame, NULL, DrvScan, + BublboblInit, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3117,7 +3119,7 @@ struct BurnDriver BurnDrvBoblbobl = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, BoblboblRomInfo, BoblboblRomName, NULL, NULL, BoblboblInputInfo, BoblboblDIPInfo, - BoblboblInit, BublboblExit, DrvFrame, NULL, DrvScan, + BoblboblInit, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3127,7 +3129,7 @@ struct BurnDriver BurnDrvBbredux = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, BbreduxRomInfo, BbreduxRomName, NULL, NULL, BoblboblInputInfo, BoblboblDIPInfo, - BoblboblInit, BublboblExit, DrvFrame, NULL, DrvScan, + BoblboblInit, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3137,7 +3139,7 @@ struct BurnDriver BurnDrvBublboblb = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, BublboblbRomInfo, BublboblbRomName, NULL, NULL, BoblboblInputInfo, BoblboblDIPInfo, - BoblboblInit, BublboblExit, DrvFrame, NULL, DrvScan, + BoblboblInit, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3147,7 +3149,7 @@ struct BurnDriver BurnDrvSboblbobl = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, SboblboblRomInfo, SboblboblRomName, NULL, NULL, BoblboblInputInfo, BoblboblDIPInfo, - SboblboblInit, BublboblExit, DrvFrame, NULL, DrvScan, + SboblboblInit, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3157,7 +3159,7 @@ struct BurnDriver BurnDrvSboblbobla = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, SboblboblaRomInfo, SboblboblaRomName, NULL, NULL, BoblboblInputInfo, BoblboblDIPInfo, - BoblboblInit, BublboblExit, DrvFrame, NULL, DrvScan, + BoblboblInit, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3167,7 +3169,7 @@ struct BurnDriver BurnDrvSboblboblb = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, SboblboblbRomInfo, SboblboblbRomName, NULL, NULL, BoblboblInputInfo, SboblbobDIPInfo, - BoblboblInit, BublboblExit, DrvFrame, NULL, DrvScan, + BoblboblInit, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3177,7 +3179,7 @@ struct BurnDriver BurnDrvSboblboblc = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, SboblboblcRomInfo, SboblboblcRomName, NULL, NULL, BoblboblInputInfo, SboblbobDIPInfo, - BoblboblInit, BublboblExit, DrvFrame, NULL, DrvScan, + BoblboblInit, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3187,7 +3189,7 @@ struct BurnDriver BurnDrvSboblbobld = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, SboblbobldRomInfo, SboblbobldRomName, NULL, NULL, BoblboblInputInfo, SboblbobDIPInfo, - BoblboblInit, BublboblExit, DrvFrame, NULL, DrvScan, + BoblboblInit, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3197,7 +3199,7 @@ struct BurnDriver BurnDrvBub68705 = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, Bub68705RomInfo, Bub68705RomName, NULL, NULL, BublboblInputInfo, BublboblDIPInfo, - Bub68705Init, BublboblExit, DrvFrame, NULL, DrvScan, + Bub68705Init, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3207,7 +3209,7 @@ struct BurnDriver BurnDrvBub68705a = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, Bub68705aRomInfo, Bub68705aRomName, NULL, NULL, BublboblInputInfo, BublboblDIPInfo, - Bub68705Init, BublboblExit, DrvFrame, NULL, DrvScan, + Bub68705Init, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3217,7 +3219,7 @@ struct BurnDriver BurnDrvDland = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, DlandRomInfo, DlandRomName, NULL, NULL, BoblboblInputInfo, DlandDIPInfo, - DlandInit, BublboblExit, DrvFrame, NULL, DrvScan, + DlandInit, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3227,7 +3229,7 @@ struct BurnDriver BurnDrvBublcave = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_HOMEBREW | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, BublcaveRomInfo, BublcaveRomName, NULL, NULL, BublboblInputInfo, BublboblDIPInfo, - BublboblInit, BublboblExit, DrvFrame, NULL, DrvScan, + BublboblInit, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3237,7 +3239,7 @@ struct BurnDriver BurnDrvBoblcave = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, BoblcaveRomInfo, BoblcaveRomName, NULL, NULL, BoblboblInputInfo, BoblboblDIPInfo, - BoblboblInit, BublboblExit, DrvFrame, NULL, DrvScan, + BoblboblInit, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3247,7 +3249,7 @@ struct BurnDriver BurnDrvBublcave11 = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_HOMEBREW | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, Bublcave11RomInfo, Bublcave11RomName, NULL, NULL, BublboblInputInfo, BublboblDIPInfo, - BublboblInit, BublboblExit, DrvFrame, NULL, DrvScan, + BublboblInit, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3257,7 +3259,7 @@ struct BurnDriver BurnDrvBublcave10 = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_HOMEBREW | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, Bublcave10RomInfo, Bublcave10RomName, NULL, NULL, BublboblInputInfo, BublboblDIPInfo, - BublboblInit, BublboblExit, DrvFrame, NULL, DrvScan, + BublboblInit, BublboblExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3267,7 +3269,7 @@ struct BurnDriver BurnDrvBublboblp = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_PROTOTYPE | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, BublboblpRomInfo, BublboblpRomName, NULL, NULL, BublboblInputInfo, BublboblDIPInfo, - BublboblpInit, DrvExit, TokioFrame, NULL, DrvScan, + BublboblpInit, DrvExit, TokioFrame, DrvDraw, DrvScan, NULL, 0x100, 256, 224, 4, 3 }; @@ -3277,7 +3279,7 @@ struct BurnDriver BurnDrvTokio = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_VERSHOOT, 0, NULL, tokioRomInfo, tokioRomName, NULL, NULL, TokioInputInfo, TokioDIPInfo, - TokioInit, DrvExit, TokioFrame, NULL, DrvScan, + TokioInit, DrvExit, TokioFrame, DrvDraw, DrvScan, NULL, 0x100, 224, 256, 3, 4 }; @@ -3287,7 +3289,7 @@ struct BurnDriver BurnDrvTokioo = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_VERSHOOT, 0, NULL, tokiooRomInfo, tokiooRomName, NULL, NULL, TokioInputInfo, TokioDIPInfo, - TokioInit, DrvExit, TokioFrame, NULL, DrvScan, + TokioInit, DrvExit, TokioFrame, DrvDraw, DrvScan, NULL, 0x100, 224, 256, 3, 4 }; @@ -3297,7 +3299,7 @@ struct BurnDriver BurnDrvTokiou = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_VERSHOOT, 0, NULL, tokiouRomInfo, tokiouRomName, NULL, NULL, TokioInputInfo, TokioDIPInfo, - TokioInit, DrvExit, TokioFrame, NULL, DrvScan, + TokioInit, DrvExit, TokioFrame, DrvDraw, DrvScan, NULL, 0x100, 224, 256, 3, 4 }; @@ -3307,6 +3309,6 @@ struct BurnDriver BurnDrvTokiob = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED | BDF_HISCORE_SUPPORTED, 2, HARDWARE_TAITO_MISC, GBF_VERSHOOT, 0, NULL, tokiobRomInfo, tokiobRomName, NULL, NULL, TokioInputInfo, TokioDIPInfo, - TokiobInit, DrvExit, TokioFrame, NULL, DrvScan, + TokiobInit, DrvExit, TokioFrame, DrvDraw, DrvScan, NULL, 0x100, 224, 256, 3, 4 }; diff --git a/src/burn/drv/taito/d_darius2.cpp b/src/burn/drv/taito/d_darius2.cpp index 1224d9584..6c563d176 100644 --- a/src/burn/drv/taito/d_darius2.cpp +++ b/src/burn/drv/taito/d_darius2.cpp @@ -14,10 +14,6 @@ static INT32 Ninjaw = 0, Warriorb = 0; static double Darius2YM2610Route1MasterVol; static double Darius2YM2610Route2MasterVol; -static void Darius2Draw(); -static void Darius2dDraw(); -static void WarriorbDraw(); - static struct BurnInputInfo Darius2InputList[] = { {"P1 Coin" , BIT_DIGITAL , TC0220IOCInputPort0 + 2, "p1 coin" }, @@ -1461,7 +1457,6 @@ static INT32 Darius2Init() Darius2YM2610Route2MasterVol = 1.00; bYM2610UseSeperateVolumes = 1; - TaitoDrawFunction = Darius2Draw; TaitoMakeInputsFunction = Darius2MakeInputs; TaitoIrqLine = 4; @@ -1558,7 +1553,6 @@ static INT32 Darius2dInit() Darius2YM2610Route2MasterVol = 12.00; bYM2610UseSeperateVolumes = 1; - TaitoDrawFunction = Darius2dDraw; TaitoMakeInputsFunction = Darius2dMakeInputs; TaitoIrqLine = 4; @@ -1670,7 +1664,6 @@ static INT32 WarriorbInit() Darius2YM2610Route2MasterVol = 12.00; bYM2610UseSeperateVolumes = 1; - TaitoDrawFunction = WarriorbDraw; TaitoMakeInputsFunction = WarriorbMakeInputs; TaitoIrqLine = 4; @@ -1818,7 +1811,7 @@ static void Darius2dRenderSprites(INT32 PriorityDraw) } } -static void Darius2Draw() +static INT32 Darius2Draw() { INT32 Disable = TC0100SCNCtrl[0][6] & 0xf7; INT32 Disable2 = TC0100SCNCtrl[1][6] & 0xf7; @@ -1850,9 +1843,11 @@ static void Darius2Draw() if (!(Disable2 & 0x04)) TC0100SCNRenderCharLayer(1); if (!(Disable3 & 0x04)) TC0100SCNRenderCharLayer(2); BurnTransferCopy(TC0110PCRPalette); + + return 0; } -static void Darius2dDraw() +static INT32 Darius2dDraw() { INT32 Disable = TC0100SCNCtrl[0][6] & 0xf7; INT32 Disable2 = TC0100SCNCtrl[1][6] & 0xf7; @@ -1878,9 +1873,11 @@ static void Darius2dDraw() if (nBurnLayer & 4) if (!(Disable & 0x04)) TC0100SCNRenderCharLayer(0); if (nBurnLayer & 8) if (!(Disable2 & 0x04)) TC0100SCNRenderCharLayer(1); BurnTransferCopy(TC0110PCRPalette); + + return 0; } -static void WarriorbDraw() +static INT32 WarriorbDraw() { INT32 Disable = TC0100SCNCtrl[0][6] & 0xf7; INT32 Disable2 = TC0100SCNCtrl[1][6] & 0xf7; @@ -1906,6 +1903,8 @@ static void WarriorbDraw() if (nBurnLayer & 4) if (!(Disable & 0x04)) TC0100SCNRenderCharLayer(0); if (nBurnLayer & 8) if (!(Disable2 & 0x04)) TC0100SCNRenderCharLayer(1); BurnTransferCopy(TC0110PCRPalette); + + return 0; } static INT32 Darius2Frame() @@ -1956,7 +1955,7 @@ static INT32 Darius2Frame() } ZetClose(); - if (pBurnDraw) TaitoDrawFunction(); + if (pBurnDraw) BurnDrvRedraw(); return 0; } @@ -1998,7 +1997,7 @@ static INT32 Darius2dFrame() } ZetClose(); - if (pBurnDraw) TaitoDrawFunction(); + if (pBurnDraw) BurnDrvRedraw(); return 0; } @@ -2049,7 +2048,7 @@ struct BurnDriver BurnDrvDarius2 = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_MISC, GBF_HORSHOOT, 0, NULL, Darius2RomInfo, Darius2RomName, NULL, NULL, Darius2InputInfo, Darius2DIPInfo, - Darius2Init, Darius2Exit, Darius2Frame, NULL, Darius2Scan, + Darius2Init, Darius2Exit, Darius2Frame, Darius2Draw, Darius2Scan, NULL, 0x3000, 864, 224, 12, 3 }; @@ -2059,7 +2058,7 @@ struct BurnDriver BurnDrvDarius2d = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_HORSHOOT, 0, NULL, Darius2dRomInfo, Darius2dRomName, NULL, NULL, Darius2dInputInfo, Darius2dDIPInfo, - Darius2dInit, Darius2Exit, Darius2dFrame, NULL, Darius2Scan, + Darius2dInit, Darius2Exit, Darius2dFrame, Darius2dDraw, Darius2Scan, NULL, 0x2000, 640, 224, 8, 3 }; @@ -2069,7 +2068,7 @@ struct BurnDriver BurnDrvDarius2do = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_HORSHOOT, 0, NULL, Darius2doRomInfo, Darius2doRomName, NULL, NULL, Darius2dInputInfo, Darius2dDIPInfo, - Darius2dInit, Darius2Exit, Darius2dFrame, NULL, Darius2Scan, + Darius2dInit, Darius2Exit, Darius2dFrame, Darius2dDraw, Darius2Scan, NULL, 0x2000, 640, 224, 8, 3 }; @@ -2079,7 +2078,7 @@ struct BurnDriver BurnDrvNinjaw = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, NinjawRomInfo, NinjawRomName, NULL, NULL, Darius2InputInfo, NinjawDIPInfo, - NinjawInit, Darius2Exit, Darius2Frame, NULL, Darius2Scan, + NinjawInit, Darius2Exit, Darius2Frame, Darius2Draw, Darius2Scan, NULL, 0x3000, 864, 224, 12, 3 }; @@ -2089,7 +2088,7 @@ struct BurnDriver BurnDrvNinjaw1 = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, Ninjaw1RomInfo, Ninjaw1RomName, NULL, NULL, Darius2InputInfo, NinjawDIPInfo, - NinjawInit, Darius2Exit, Darius2Frame, NULL, Darius2Scan, + NinjawInit, Darius2Exit, Darius2Frame, Darius2Draw, Darius2Scan, NULL, 0x3000, 864, 224, 12, 3 }; @@ -2099,7 +2098,7 @@ struct BurnDriver BurnDrvNinjawj = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, NinjawjRomInfo, NinjawjRomName, NULL, NULL, Darius2InputInfo, NinjawjDIPInfo, - NinjawInit, Darius2Exit, Darius2Frame, NULL, Darius2Scan, + NinjawInit, Darius2Exit, Darius2Frame, Darius2Draw, Darius2Scan, NULL, 0x3000, 864, 224, 12, 3 }; @@ -2109,7 +2108,7 @@ struct BurnDriver BurnDrvNinjawu = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, NinjawuRomInfo, NinjawuRomName, NULL, NULL, Darius2InputInfo, NinjawjDIPInfo, - NinjawInit, Darius2Exit, Darius2Frame, NULL, Darius2Scan, + NinjawInit, Darius2Exit, Darius2Frame, Darius2Draw, Darius2Scan, NULL, 0x3000, 864, 224, 12, 3 }; @@ -2119,6 +2118,6 @@ struct BurnDriver BurnDrvWarriorb = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_MISC, GBF_HORSHOOT, 0, NULL, WarriorbRomInfo, WarriorbRomName, NULL, NULL, WarriorbInputInfo, WarriorbDIPInfo, - WarriorbInit, Darius2Exit, Darius2dFrame, NULL, Darius2Scan, + WarriorbInit, Darius2Exit, Darius2dFrame, WarriorbDraw, Darius2Scan, NULL, 0x2000, 640, 240, 8, 3 }; diff --git a/src/burn/drv/taito/d_othunder.cpp b/src/burn/drv/taito/d_othunder.cpp index 429c195f9..bbe8c6e17 100644 --- a/src/burn/drv/taito/d_othunder.cpp +++ b/src/burn/drv/taito/d_othunder.cpp @@ -9,8 +9,6 @@ #include "eeprom.h" #include "burn_gun.h" -static void OthunderDraw(); - static double OthunderYM2610AY8910RouteMasterVol; static double OthunderYM2610Route1MasterVol; static double OthunderYM2610Route2MasterVol; @@ -908,7 +906,6 @@ static INT32 OthunderInit() if (!EEPROMAvailable()) EEPROMFill(TaitoDefaultEEProm, 0, 128); TaitoMakeInputsFunction = OthunderMakeInputs; - TaitoDrawFunction = OthunderDraw; TaitoIrqLine = 5; TaitoFrameInterleave = 100; TaitoFlipScreenX = 1; @@ -1100,7 +1097,7 @@ static void OthunderRenderSprites(INT32 PriorityDraw) } } -static void OthunderDraw() +static INT32 OthunderDraw() { INT32 Disable = TC0100SCNCtrl[0][6] & 0xf7; @@ -1124,6 +1121,8 @@ static void OthunderDraw() for (INT32 i = 0; i < nBurnGunNumPlayers; i++) { BurnGunDrawTarget(i, BurnGunX[i] >> 8, BurnGunY[i] >> 8); } + + return 0; } static INT32 OthunderFrame() @@ -1163,7 +1162,7 @@ static INT32 OthunderFrame() } ZetClose(); - if (pBurnDraw) TaitoDrawFunction(); + if (pBurnDraw) BurnDrvRedraw(); return 0; } @@ -1218,7 +1217,7 @@ struct BurnDriver BurnDrvOthunder = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0, NULL, OthunderRomInfo, OthunderRomName, NULL, NULL, OthunderInputInfo, OthunderDIPInfo, - OthunderInit, OthunderExit, OthunderFrame, NULL, OthunderScan, + OthunderInit, OthunderExit, OthunderFrame, OthunderDraw, OthunderScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -1228,7 +1227,7 @@ struct BurnDriver BurnDrvOthundero = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0, NULL, OthunderoRomInfo, OthunderoRomName, NULL, NULL, OthunderInputInfo, OthunderuDIPInfo, - OthunderInit, OthunderExit, OthunderFrame, NULL, OthunderScan, + OthunderInit, OthunderExit, OthunderFrame, OthunderDraw, OthunderScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -1238,7 +1237,7 @@ struct BurnDriver BurnDrvOthunderu = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0, NULL, OthunderuRomInfo, OthunderuRomName, NULL, NULL, OthunderInputInfo, OthunderuDIPInfo, - OthunderInit, OthunderExit, OthunderFrame, NULL, OthunderScan, + OthunderInit, OthunderExit, OthunderFrame, OthunderDraw, OthunderScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -1248,7 +1247,7 @@ struct BurnDriver BurnDrvOthunderuo = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0, NULL, OthunderuoRomInfo, OthunderuoRomName, NULL, NULL, OthunderInputInfo, OthunderuDIPInfo, - OthunderInit, OthunderExit, OthunderFrame, NULL, OthunderScan, + OthunderInit, OthunderExit, OthunderFrame, OthunderDraw, OthunderScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -1258,7 +1257,7 @@ struct BurnDriver BurnDrvOthunderj = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0, NULL, OthunderjRomInfo, OthunderjRomName, NULL, NULL, OthunderInputInfo, OthunderjDIPInfo, - OthunderInit, OthunderExit, OthunderFrame, NULL, OthunderScan, + OthunderInit, OthunderExit, OthunderFrame, OthunderDraw, OthunderScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -1268,6 +1267,6 @@ struct BurnDriver BurnDrvOthunderjsc = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0, NULL, OthunderjscRomInfo, OthunderjscRomName, NULL, NULL, OthunderInputInfo, OthunderjDIPInfo, - OthunderInit, OthunderExit, OthunderFrame, NULL, OthunderScan, + OthunderInit, OthunderExit, OthunderFrame, OthunderDraw, OthunderScan, NULL, 0x1000, 320, 240, 4, 3 }; \ No newline at end of file diff --git a/src/burn/drv/taito/d_slapshot.cpp b/src/burn/drv/taito/d_slapshot.cpp index 772bee608..aef34eee0 100644 --- a/src/burn/drv/taito/d_slapshot.cpp +++ b/src/burn/drv/taito/d_slapshot.cpp @@ -10,8 +10,6 @@ #include "burn_gun.h" #include "timekpr.h" -static void SlapshotDraw(); -static void Opwolf3Draw(); static TaitoF2SpriteBufferUpdate TaitoF2SpriteBufferFunction; static INT32 CheckTimeKeeper = 0; // for gun auto-calibration @@ -559,7 +557,6 @@ static INT32 MachineInit() BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH); TaitoMakeInputsFunction = TC0640FIOMakeInputs; - TaitoDrawFunction = SlapshotDraw; nTaitoCyclesTotal[0] = 14364000 / 60; nTaitoCyclesTotal[1] = 4000000 / 60; @@ -691,7 +688,6 @@ static INT32 Opwolf3Init() SekClose(); TaitoMakeInputsFunction = Opwolf3MakeInputs; - TaitoDrawFunction = Opwolf3Draw; Opwolf3mode = 1; BurnGunInit(2, true); @@ -745,7 +741,7 @@ static void SlapshotCalcPalette() } } -static void SlapshotDraw() +static INT32 SlapshotDraw() { UINT8 Layer[4]; UINT16 Priority = TC0480SCPGetBgPriority(); @@ -765,14 +761,6 @@ static void SlapshotDraw() TaitoF2SpritePriority[2] = TC0360PRIRegs[7] & 0x0f; TaitoF2SpritePriority[3] = TC0360PRIRegs[7] >> 4; -#if 0 - // ** save this! ** for later impl. in d_taitof2 -dink - bprintf(0, _T("sprite %X %X %X %X\n"), TaitoF2SpritePriority[0], TaitoF2SpritePriority[1], TaitoF2SpritePriority[2], TaitoF2SpritePriority[3]); - bprintf(0, _T("tile %X %X %X %X\n"), TaitoF2TilePriority[0], TaitoF2TilePriority[1], TaitoF2TilePriority[2], TaitoF2TilePriority[3]); - bprintf(0, _T("layer %X %X %X %X\n"), Layer[0], Layer[1], Layer[2], Layer[3]); - bprintf(0, _T("pri %X %X %X %X %X %X %X %X %X %X.\n"), TC0360PRIRegs[0], TC0360PRIRegs[1], TC0360PRIRegs[2], TC0360PRIRegs[3], TC0360PRIRegs[4], TC0360PRIRegs[5], TC0360PRIRegs[6], TC0360PRIRegs[7], TC0360PRIRegs[8], TC0360PRIRegs[9], TC0360PRIRegs[10]); -#endif - SlapshotCalcPalette(); BurnTransferClear(); @@ -800,15 +788,8 @@ static void SlapshotDraw() TC0480SCPRenderCharLayer(); BurnTransferCopy(TaitoPalette); -} -static void Opwolf3Draw() -{ - SlapshotDraw(); - - /*for (INT32 i = 0; i < nBurnGunNumPlayers; i++) { // game draws it's own targets. saving just incase. - BurnGunDrawTarget(i, BurnGunX[i] >> 8, BurnGunY[i] >> 8); - }*/ + return 0; } static void Opwolf3Defaults() @@ -883,7 +864,7 @@ static INT32 SlapshotFrame() TaitoF2HandleSpriteBuffering(); - if (pBurnDraw) TaitoDrawFunction(); + if (pBurnDraw) BurnDrvRedraw(); TaitoF2SpriteBufferFunction(); @@ -951,7 +932,7 @@ struct BurnDriver BurnDrvSlapshot = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_MISC, GBF_SPORTSMISC, 0, NULL, SlapshotRomInfo, SlapshotRomName, NULL, NULL, SlapshotInputInfo, SlapshotDIPInfo, - SlapshotInit, SlapshotExit, SlapshotFrame, NULL, SlapshotScan, + SlapshotInit, SlapshotExit, SlapshotFrame, SlapshotDraw, SlapshotScan, NULL, 0x2000, 320, 224, 4, 3 }; @@ -961,7 +942,7 @@ struct BurnDriver BurnDrvOpwolf3 = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0, NULL, Opwolf3RomInfo, Opwolf3RomName, NULL, NULL, Opwolf3InputInfo, Opwolf3DIPInfo, - Opwolf3Init, SlapshotExit, SlapshotFrame, NULL, Opwolf3Scan, + Opwolf3Init, SlapshotExit, SlapshotFrame, SlapshotDraw, Opwolf3Scan, NULL, 0x2000, 320, 224, 4, 3 }; @@ -971,6 +952,6 @@ struct BurnDriver BurnDrvOpwolf3u = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0, NULL, Opwolf3uRomInfo, Opwolf3uRomName, NULL, NULL, Opwolf3InputInfo, Opwolf3DIPInfo, - Opwolf3Init, SlapshotExit, SlapshotFrame, NULL, Opwolf3Scan, + Opwolf3Init, SlapshotExit, SlapshotFrame, SlapshotDraw, Opwolf3Scan, NULL, 0x2000, 320, 224, 4, 3 }; diff --git a/src/burn/drv/taito/d_superchs.cpp b/src/burn/drv/taito/d_superchs.cpp index 9172d97a7..adce5873a 100644 --- a/src/burn/drv/taito/d_superchs.cpp +++ b/src/burn/drv/taito/d_superchs.cpp @@ -754,7 +754,7 @@ static void SuperchsRenderSpriteList(INT32 SpritePriorityLevel) } } -static void SuperchsDraw() +static INT32 SuperchsDraw() { UINT8 Layer[4]; UINT16 Priority = TC0480SCPGetBgPriority(); @@ -780,6 +780,8 @@ static void SuperchsDraw() if (nSpriteEnable & 8) SuperchsRenderSpriteList(3); BurnTransferCopy(TaitoPalette); BurnShiftRender(); + + return 0; } static INT32 SuperchsFrame() @@ -863,7 +865,7 @@ struct BurnDriver BurnDrvSuperchs = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_MISC, GBF_RACING, 0, NULL, SuperchsRomInfo, SuperchsRomName, NULL, NULL, SuperchsInputInfo, NULL, - SuperchsInit, SuperchsExit, SuperchsFrame, NULL, SuperchsScan, + SuperchsInit, SuperchsExit, SuperchsFrame, SuperchsDraw, SuperchsScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -873,7 +875,7 @@ struct BurnDriver BurnDrvSuperchsu = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_RACING, 0, NULL, SuperchsuRomInfo, SuperchsuRomName, NULL, NULL, SuperchsInputInfo, NULL, - SuperchsInit, SuperchsExit, SuperchsFrame, NULL, SuperchsScan, + SuperchsInit, SuperchsExit, SuperchsFrame, SuperchsDraw, SuperchsScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -883,7 +885,7 @@ struct BurnDriver BurnDrvSuperchsj = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_RACING, 0, NULL, SuperchsjRomInfo, SuperchsjRomName, NULL, NULL, SuperchsInputInfo, NULL, - SuperchsInit, SuperchsExit, SuperchsFrame, NULL, SuperchsScan, + SuperchsInit, SuperchsExit, SuperchsFrame, SuperchsDraw, SuperchsScan, NULL, 0x2000, 320, 240, 4, 3 }; diff --git a/src/burn/drv/taito/d_taitob.cpp b/src/burn/drv/taito/d_taitob.cpp index 630a397ca..bb3a49e02 100644 --- a/src/burn/drv/taito/d_taitob.cpp +++ b/src/burn/drv/taito/d_taitob.cpp @@ -4276,4 +4276,4 @@ struct BurnDriver BurnDrvSbmj = { NULL, sbmjRomInfo, sbmjRomName, NULL, NULL, SbmInputInfo, SbmDIPInfo, SbmInit, DrvExit, DrvFrame, DrvDraw, DrvScan, NULL, 0x1000, 320, 224, 4, 3 -}; \ No newline at end of file +}; diff --git a/src/burn/drv/taito/d_taitoh.cpp b/src/burn/drv/taito/d_taitoh.cpp index 3608a559a..441c1aa8a 100644 --- a/src/burn/drv/taito/d_taitoh.cpp +++ b/src/burn/drv/taito/d_taitoh.cpp @@ -2087,7 +2087,7 @@ struct BurnDriver BurnDrvRecordbr = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_SPORTSMISC, 0, NULL, recordbrRomInfo, recordbrRomName, NULL, NULL, RecordbrInputInfo, RecordbrDIPInfo, - SyvalionInit, DrvExit, DrvFrame, RecordbrDraw, NULL, NULL, 0x210, + SyvalionInit, DrvExit, DrvFrame, RecordbrDraw, DrvScan, NULL, 0x210, 320, 240, 4, 3 }; @@ -2127,7 +2127,7 @@ struct BurnDriver BurnDrvGogold = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_SPORTSMISC, 0, NULL, gogoldRomInfo, gogoldRomName, NULL, NULL, RecordbrInputInfo, GogoldDIPInfo, - SyvalionInit, DrvExit, DrvFrame, RecordbrDraw, NULL, NULL, 0x210, + SyvalionInit, DrvExit, DrvFrame, RecordbrDraw, DrvScan, NULL, 0x210, 320, 240, 4, 3 }; @@ -2165,7 +2165,7 @@ struct BurnDriver BurnDrvTetristh = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_PUZZLE, 0, NULL, tetristhRomInfo, tetristhRomName, NULL, NULL, TetristhInputInfo, TetristhDIPInfo, - TetristhInit, DrvExit, DrvFrame, RecordbrDraw, NULL, NULL, 0x210, + TetristhInit, DrvExit, DrvFrame, RecordbrDraw, DrvScan, NULL, 0x210, 320, 224, 4, 3 }; @@ -2208,7 +2208,7 @@ struct BurnDriver BurnDrvDleague = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_MISC, GBF_SPORTSMISC, 0, NULL, dleagueRomInfo, dleagueRomName, NULL, NULL, DleagueInputInfo, DleagueDIPInfo, - DleagueInit, DrvExit, DrvFrame, DleagueDraw, NULL, NULL, 0x210, + DleagueInit, DrvExit, DrvFrame, DleagueDraw, DrvScan, NULL, 0x210, 320, 240, 4, 3 }; @@ -2250,6 +2250,6 @@ struct BurnDriver BurnDrvDleaguej = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_SPORTSMISC, 0, NULL, dleaguejRomInfo, dleaguejRomName, NULL, NULL, DleagueInputInfo, DleaguejDIPInfo, - DleagueInit, DrvExit, DrvFrame, DleagueJDraw, NULL, NULL, 0x210, + DleagueInit, DrvExit, DrvFrame, DleagueJDraw, DrvScan, NULL, 0x210, 320, 240, 4, 3 }; diff --git a/src/burn/drv/taito/d_taitomisc.cpp b/src/burn/drv/taito/d_taitomisc.cpp index 7ea345a69..e18fadbe5 100644 --- a/src/burn/drv/taito/d_taitomisc.cpp +++ b/src/burn/drv/taito/d_taitomisc.cpp @@ -48,14 +48,6 @@ static INT32 z80ctc_ctr; static UINT16 *pTopspeedTempDraw = NULL; static UINT16 *DrvPriBmp = NULL; -static void DariusDraw(); -static void OpwolfDraw(); -static void RbislandDraw(); -static void JumpingDraw(); -static void RastanDraw(); -static void TopspeedDraw(); -static void VolfiedDraw(); - #define A(a, b, c, d) {a, b, (UINT8*)(c), d} static struct BurnInputInfo DariusInputList[] = @@ -4559,7 +4551,6 @@ static INT32 DariusInit() GenericTilesInit(); - TaitoDrawFunction = DariusDraw; TaitoMakeInputsFunction = DariusMakeInputs; TaitoIrqLine = 4; @@ -4663,7 +4654,6 @@ static INT32 OpwolfInit() BurnGunInit(1, true); bUseGuns = 1; - TaitoDrawFunction = OpwolfDraw; TaitoMakeInputsFunction = OpwolfMakeInputs; TaitoIrqLine = 5; @@ -4782,7 +4772,6 @@ static INT32 OpwolfbInit() BurnGunInit(1, true); bUseGuns = 1; - TaitoDrawFunction = OpwolfDraw; TaitoMakeInputsFunction = OpwolfbMakeInputs; TaitoIrqLine = 5; @@ -4878,7 +4867,6 @@ static INT32 RbislandInit() GenericTilesInit(); - TaitoDrawFunction = RbislandDraw; TaitoMakeInputsFunction = RbislandMakeInputs; TaitoIrqLine = 4; @@ -4972,7 +4960,6 @@ static INT32 JumpingInit() GenericTilesInit(); - TaitoDrawFunction = JumpingDraw; TaitoMakeInputsFunction = JumpingMakeInputs; TaitoIrqLine = 4; PC080SNSetFgTransparentPen(0, 0x0f); @@ -5067,7 +5054,6 @@ static INT32 RastanInit() GenericTilesInit(); - TaitoDrawFunction = RastanDraw; TaitoMakeInputsFunction = RastanMakeInputs; TaitoIrqLine = 5; @@ -5180,7 +5166,6 @@ static INT32 TopspeedInit() GenericTilesInit(); - TaitoDrawFunction = TopspeedDraw; TaitoMakeInputsFunction = TopspeedMakeInputs; TaitoIrqLine = 5; @@ -5271,7 +5256,6 @@ static INT32 VolfiedInit() GenericTilesInit(); - TaitoDrawFunction = VolfiedDraw; TaitoMakeInputsFunction = VolfiedMakeInputs; TaitoIrqLine = 4; @@ -5722,7 +5706,7 @@ static void TopspeedDrawSprites(INT32 /*PriorityDraw*/) } } -static void DariusDraw() +static INT32 DariusDraw() { BurnTransferClear(); TaitoMiscCalcPalette(); @@ -5732,9 +5716,11 @@ static void DariusDraw() DariusDrawSprites(1); DariusDrawCharLayer(); BurnTransferCopy(TaitoPalette); + + return 0; } -static void OpwolfDraw() +static INT32 OpwolfDraw() { BurnTransferClear(); OpwolfCalcPalette(); @@ -5746,9 +5732,11 @@ static void OpwolfDraw() for (INT32 i = 0; i < nBurnGunNumPlayers; i++) { BurnGunDrawTarget(i, BurnGunX[i] >> 8, BurnGunY[i] >> 8); } + + return 0; } -static void RbislandDraw() +static INT32 RbislandDraw() { BurnTransferClear(); TaitoMiscCalcPalette(); @@ -5756,9 +5744,11 @@ static void RbislandDraw() PC090OJDrawSprites(TaitoSpritesA); PC080SNDrawFgLayer(0, 0, TaitoChars, pTransDraw); BurnTransferCopy(TaitoPalette); + + return 0; } -static void JumpingDraw() +static INT32 JumpingDraw() { BurnTransferClear(); JumpingCalcPalette(); @@ -5767,9 +5757,11 @@ static void JumpingDraw() JumpingDrawSprites(); PC080SNDrawFgLayer(0, 0, TaitoChars, pTransDraw); BurnTransferCopy(TaitoPalette); + + return 0; } -static void RastanDraw() +static INT32 RastanDraw() { BurnTransferClear(); TaitoMiscCalcPalette(); @@ -5777,9 +5769,11 @@ static void RastanDraw() PC080SNDrawFgLayer(0, 0, TaitoChars, pTransDraw); PC090OJDrawSprites(TaitoSpritesA); BurnTransferCopy(TaitoPalette); + + return 0; } -static void TopspeedDraw() +static INT32 TopspeedDraw() { BurnTransferClear(); TaitoMiscCalcPalette(); @@ -5794,9 +5788,11 @@ static void TopspeedDraw() BurnTransferCopy(TaitoPalette); BurnShiftRender(); + + return 0; } -static void VolfiedDraw() +static INT32 VolfiedDraw() { BurnTransferClear(); TaitoMiscCalcPalette(); @@ -5825,6 +5821,8 @@ static void VolfiedDraw() PC090OJDrawSprites(TaitoSpritesA); BurnTransferCopy(TaitoPalette); + + return 0; } static INT32 TaitoMiscFrame() @@ -5911,7 +5909,7 @@ static INT32 TaitoMiscFrame() if (TaitoNumZ80s >= 1) ZetClose(); } - if (pBurnDraw) TaitoDrawFunction(); + if (pBurnDraw) BurnDrvRedraw(); return 0; } @@ -5976,7 +5974,7 @@ static INT32 DariusFrame() if (pBurnSoundOut) MSM5205Render(0, pBurnSoundOut, nBurnSoundLen); ZetClose(); - if (pBurnDraw) TaitoDrawFunction(); + if (pBurnDraw) BurnDrvRedraw(); return 0; } @@ -6022,7 +6020,7 @@ static INT32 JumpingFrame() if (pBurnSoundOut) BurnYM2203Update(pBurnSoundOut, nBurnSoundLen); ZetClose(); - if (pBurnDraw) TaitoDrawFunction(); + if (pBurnDraw) BurnDrvRedraw(); return 0; } @@ -6111,7 +6109,7 @@ static INT32 TopspeedFrame() if (TaitoNumZ80s >= 1) ZetClose(); } - if (pBurnDraw) TaitoDrawFunction(); + if (pBurnDraw) BurnDrvRedraw(); return 0; } @@ -6186,7 +6184,7 @@ struct BurnDriver BurnDrvDarius = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_MISC, GBF_HORSHOOT, 0, NULL, DariusRomInfo, DariusRomName, NULL, NULL, DariusInputInfo, DariusDIPInfo, - DariusInit, TaitoMiscExit, DariusFrame, NULL, TaitoMiscScan, + DariusInit, TaitoMiscExit, DariusFrame, DariusDraw, TaitoMiscScan, NULL, 0x2000, 864, 224, 12, 3 }; @@ -6196,7 +6194,7 @@ struct BurnDriver BurnDrvDariusu = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_HORSHOOT, 0, NULL, DariusuRomInfo, DariusuRomName, NULL, NULL, DariusInputInfo, DariusuDIPInfo, - DariusInit, TaitoMiscExit, DariusFrame, NULL, TaitoMiscScan, + DariusInit, TaitoMiscExit, DariusFrame, DariusDraw, TaitoMiscScan, NULL, 0x2000, 864, 224, 12, 3 }; @@ -6206,7 +6204,7 @@ struct BurnDriver BurnDrvDariusj = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_HORSHOOT, 0, NULL, DariusjRomInfo, DariusjRomName, NULL, NULL, DariusInputInfo, DariusjDIPInfo, - DariusInit, TaitoMiscExit, DariusFrame, NULL, TaitoMiscScan, + DariusInit, TaitoMiscExit, DariusFrame, DariusDraw, TaitoMiscScan, NULL, 0x2000, 864, 224, 12, 3 }; @@ -6216,7 +6214,7 @@ struct BurnDriver BurnDrvDariuso = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_HORSHOOT, 0, NULL, DariusoRomInfo, DariusoRomName, NULL, NULL, DariusInputInfo, DariusjDIPInfo, - DariusInit, TaitoMiscExit, DariusFrame, NULL, TaitoMiscScan, + DariusInit, TaitoMiscExit, DariusFrame, DariusDraw, TaitoMiscScan, NULL, 0x2000, 864, 224, 12, 3 }; @@ -6226,7 +6224,7 @@ struct BurnDriver BurnDrvDariuse = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_HORSHOOT, 0, NULL, DariuseRomInfo, DariuseRomName, NULL, NULL, DariusInputInfo, DariusuDIPInfo, - DariusInit, TaitoMiscExit, DariusFrame, NULL, TaitoMiscScan, + DariusInit, TaitoMiscExit, DariusFrame, DariusDraw, TaitoMiscScan, NULL, 0x2000, 864, 224, 12, 3 }; @@ -6236,7 +6234,7 @@ struct BurnDriver BurnDrvOpwolf = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0, NULL, OpwolfRomInfo, OpwolfRomName, NULL, NULL, OpwolfInputInfo, OpwolfDIPInfo, - OpwolfInit, TaitoMiscExit, TaitoMiscFrame, NULL, TaitoMiscScan, + OpwolfInit, TaitoMiscExit, TaitoMiscFrame, OpwolfDraw, TaitoMiscScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -6246,7 +6244,7 @@ struct BurnDriver BurnDrvOpwolfa = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0, NULL, OpwolfaRomInfo, OpwolfaRomName, NULL, NULL, OpwolfInputInfo, OpwolfDIPInfo, - OpwolfInit, TaitoMiscExit, TaitoMiscFrame, NULL, TaitoMiscScan, + OpwolfInit, TaitoMiscExit, TaitoMiscFrame, OpwolfDraw, TaitoMiscScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -6256,7 +6254,7 @@ struct BurnDriver BurnDrvOpwolfj = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0, NULL, OpwolfjRomInfo, OpwolfjRomName, NULL, NULL, OpwolfInputInfo, OpwolfDIPInfo, - OpwolfInit, TaitoMiscExit, TaitoMiscFrame, NULL, TaitoMiscScan, + OpwolfInit, TaitoMiscExit, TaitoMiscFrame, OpwolfDraw, TaitoMiscScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -6266,7 +6264,7 @@ struct BurnDriver BurnDrvOpwolfjsc = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0, NULL, OpwolfjscRomInfo, OpwolfjscRomName, NULL, NULL, OpwolfInputInfo, OpwolfDIPInfo, - OpwolfInit, TaitoMiscExit, TaitoMiscFrame, NULL, TaitoMiscScan, + OpwolfInit, TaitoMiscExit, TaitoMiscFrame, OpwolfDraw, TaitoMiscScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -6276,7 +6274,7 @@ struct BurnDriver BurnDrvOpwolfu = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0, NULL, OpwolfuRomInfo, OpwolfuRomName, NULL, NULL, OpwolfInputInfo, OpwolfuDIPInfo, - OpwolfInit, TaitoMiscExit, TaitoMiscFrame, NULL, TaitoMiscScan, + OpwolfInit, TaitoMiscExit, TaitoMiscFrame, OpwolfDraw, TaitoMiscScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -6286,7 +6284,7 @@ struct BurnDriver BurnDrvOpwolfb = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_TAITO_MISC, GBF_SHOOT, 0, NULL, OpwolfbRomInfo, OpwolfbRomName, NULL, NULL, OpwolfInputInfo, OpwolfbDIPInfo, - OpwolfbInit, TaitoMiscExit, TaitoMiscFrame, NULL, TaitoMiscScan, + OpwolfbInit, TaitoMiscExit, TaitoMiscFrame, OpwolfDraw, TaitoMiscScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -6296,7 +6294,7 @@ struct BurnDriver BurnDrvRbisland = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, RbislandRomInfo, RbislandRomName, NULL, NULL, RbislandInputInfo, RbislandDIPInfo, - RbislandInit, TaitoMiscExit, TaitoMiscFrame, NULL, TaitoMiscScan, + RbislandInit, TaitoMiscExit, TaitoMiscFrame, RbislandDraw, TaitoMiscScan, NULL, 0x2000, 320, 224, 4, 3 }; @@ -6306,7 +6304,7 @@ struct BurnDriver BurnDrvRbislando = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, RbislandoRomInfo, RbislandoRomName, NULL, NULL, RbislandInputInfo, RbislandDIPInfo, - RbislandInit, TaitoMiscExit, TaitoMiscFrame, NULL, TaitoMiscScan, + RbislandInit, TaitoMiscExit, TaitoMiscFrame, RbislandDraw, TaitoMiscScan, NULL, 0x2000, 320, 224, 4, 3 }; @@ -6316,7 +6314,7 @@ struct BurnDriver BurnDrvRbislande = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, RbislandeRomInfo, RbislandeRomName, NULL, NULL, RbislandInputInfo, RbislandDIPInfo, - RbislandInit, TaitoMiscExit, TaitoMiscFrame, NULL, TaitoMiscScan, + RbislandInit, TaitoMiscExit, TaitoMiscFrame, RbislandDraw, TaitoMiscScan, NULL, 0x2000, 320, 224, 4, 3 }; @@ -6326,7 +6324,7 @@ struct BurnDriver BurnDrvJumping = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, JumpingRomInfo, JumpingRomName, NULL, NULL, JumpingInputInfo, JumpingDIPInfo, - JumpingInit, TaitoMiscExit, JumpingFrame, NULL, TaitoMiscScan, + JumpingInit, TaitoMiscExit, JumpingFrame, JumpingDraw, TaitoMiscScan, NULL, 0x2000, 320, 224, 4, 3 }; @@ -6336,7 +6334,7 @@ struct BurnDriver BurnDrvJumpinga = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, JumpingaRomInfo, JumpingaRomName, NULL, NULL, JumpingInputInfo, JumpingDIPInfo, - JumpingInit, TaitoMiscExit, JumpingFrame, NULL, TaitoMiscScan, + JumpingInit, TaitoMiscExit, JumpingFrame, JumpingDraw, TaitoMiscScan, NULL, 0x2000, 320, 224, 4, 3 }; @@ -6346,7 +6344,7 @@ struct BurnDriver BurnDrvJumpingi = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, JumpingiRomInfo, JumpingiRomName, NULL, NULL, JumpingInputInfo, JumpingDIPInfo, - JumpingInit, TaitoMiscExit, JumpingFrame, NULL, TaitoMiscScan, + JumpingInit, TaitoMiscExit, JumpingFrame, JumpingDraw, TaitoMiscScan, NULL, 0x2000, 320, 224, 4, 3 }; @@ -6356,7 +6354,7 @@ struct BurnDriver BurnDrvRastan = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, RastanRomInfo, RastanRomName, NULL, NULL, RastanInputInfo, RastanDIPInfo, - RastanInit, TaitoMiscExit, TaitoMiscFrame, NULL, TaitoMiscScan, + RastanInit, TaitoMiscExit, TaitoMiscFrame, RastanDraw, TaitoMiscScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -6366,7 +6364,7 @@ struct BurnDriver BurnDrvRastana = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, RastanaRomInfo, RastanaRomName, NULL, NULL, RastanInputInfo, RastanDIPInfo, - RastanInit, TaitoMiscExit, TaitoMiscFrame, NULL, TaitoMiscScan, + RastanInit, TaitoMiscExit, TaitoMiscFrame, RastanDraw, TaitoMiscScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -6376,7 +6374,7 @@ struct BurnDriver BurnDrvRastanb = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, RastanbRomInfo, RastanbRomName, NULL, NULL, RastanInputInfo, RastanDIPInfo, - RastanInit, TaitoMiscExit, TaitoMiscFrame, NULL, TaitoMiscScan, + RastanInit, TaitoMiscExit, TaitoMiscFrame, RastanDraw, TaitoMiscScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -6386,7 +6384,7 @@ struct BurnDriver BurnDrvRastanu = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, RastanuRomInfo, RastanuRomName, NULL, NULL, RastanInputInfo, RastsagaDIPInfo, - RastanInit, TaitoMiscExit, TaitoMiscFrame, NULL, TaitoMiscScan, + RastanInit, TaitoMiscExit, TaitoMiscFrame, RastanDraw, TaitoMiscScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -6396,7 +6394,7 @@ struct BurnDriver BurnDrvRastanua = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, RastanuaRomInfo, RastanuaRomName, NULL, NULL, RastanInputInfo, RastsagaDIPInfo, - RastanInit, TaitoMiscExit, TaitoMiscFrame, NULL, TaitoMiscScan, + RastanInit, TaitoMiscExit, TaitoMiscFrame, RastanDraw, TaitoMiscScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -6406,7 +6404,7 @@ struct BurnDriver BurnDrvRastanub = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, RastanubRomInfo, RastanubRomName, NULL, NULL, RastanInputInfo, RastsagaDIPInfo, - RastanInit, TaitoMiscExit, TaitoMiscFrame, NULL, TaitoMiscScan, + RastanInit, TaitoMiscExit, TaitoMiscFrame, RastanDraw, TaitoMiscScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -6416,7 +6414,7 @@ struct BurnDriver BurnDrvRastsaga = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, RastsagaRomInfo, RastsagaRomName, NULL, NULL, RastanInputInfo, RastsagaDIPInfo, - RastanInit, TaitoMiscExit, TaitoMiscFrame, NULL, TaitoMiscScan, + RastanInit, TaitoMiscExit, TaitoMiscFrame, RastanDraw, TaitoMiscScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -6426,7 +6424,7 @@ struct BurnDriver BurnDrvRastsagaa = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, RastsagaaRomInfo, RastsagaaRomName, NULL, NULL, RastanInputInfo, RastsagaDIPInfo, - RastanInit, TaitoMiscExit, TaitoMiscFrame, NULL, TaitoMiscScan, + RastanInit, TaitoMiscExit, TaitoMiscFrame, RastanDraw, TaitoMiscScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -6436,7 +6434,7 @@ struct BurnDriver BurnDrvRastsagab = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_PLATFORM, 0, NULL, RastsagabRomInfo, RastsagabRomName, NULL, NULL, RastanInputInfo, RastsagaDIPInfo, - RastanInit, TaitoMiscExit, TaitoMiscFrame, NULL, TaitoMiscScan, + RastanInit, TaitoMiscExit, TaitoMiscFrame, RastanDraw, TaitoMiscScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -6446,7 +6444,7 @@ struct BurnDriver BurnDrvTopspeed = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_MISC, GBF_RACING, 0, NULL, TopspeedRomInfo, TopspeedRomName, NULL, NULL, TopspeedInputInfo, TopspeedDIPInfo, - TopspeedInit, TaitoMiscExit, TopspeedFrame, NULL, TaitoMiscScan, + TopspeedInit, TaitoMiscExit, TopspeedFrame, TopspeedDraw, TaitoMiscScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -6456,7 +6454,7 @@ struct BurnDriver BurnDrvTopspeedu = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_RACING, 0, NULL, TopspeeduRomInfo, TopspeeduRomName, NULL, NULL, TopspeedInputInfo, FullthrlDIPInfo, - TopspeedInit, TaitoMiscExit, TopspeedFrame, NULL, TaitoMiscScan, + TopspeedInit, TaitoMiscExit, TopspeedFrame, TopspeedDraw, TaitoMiscScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -6466,7 +6464,7 @@ struct BurnDriver BurnDrvFullthrl = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_RACING, 0, NULL, FullthrlRomInfo, FullthrlRomName, NULL, NULL, TopspeedInputInfo, FullthrlDIPInfo, - TopspeedInit, TaitoMiscExit, TopspeedFrame, NULL, TaitoMiscScan, + TopspeedInit, TaitoMiscExit, TopspeedFrame, TopspeedDraw, TaitoMiscScan, NULL, 0x2000, 320, 240, 4, 3 }; @@ -6476,7 +6474,7 @@ struct BurnDriver BurnDrvVolfied = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_TAITO_MISC, GBF_PUZZLE, 0, NULL, VolfiedRomInfo, VolfiedRomName, NULL, NULL, VolfiedInputInfo, VolfiedDIPInfo, - VolfiedInit, TaitoMiscExit, JumpingFrame, NULL, TaitoMiscScan, + VolfiedInit, TaitoMiscExit, JumpingFrame, VolfiedDraw, TaitoMiscScan, NULL, 0x2000, 240, 320, 3, 4 }; @@ -6486,7 +6484,7 @@ struct BurnDriver BurnDrvVolfiedj = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_TAITO_MISC, GBF_PUZZLE, 0, NULL, VolfiedjRomInfo, VolfiedjRomName, NULL, NULL, VolfiedInputInfo, VolfiedjDIPInfo, - VolfiedInit, TaitoMiscExit, JumpingFrame, NULL, TaitoMiscScan, + VolfiedInit, TaitoMiscExit, JumpingFrame, VolfiedDraw, TaitoMiscScan, NULL, 0x2000, 240, 320, 3, 4 }; @@ -6496,7 +6494,7 @@ struct BurnDriver BurnDrvVolfiedjo = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_TAITO_MISC, GBF_PUZZLE, 0, NULL, VolfiedjoRomInfo, VolfiedjoRomName, NULL, NULL, VolfiedInputInfo, VolfiedjDIPInfo, - VolfiedInit, TaitoMiscExit, JumpingFrame, NULL, TaitoMiscScan, + VolfiedInit, TaitoMiscExit, JumpingFrame, VolfiedDraw, TaitoMiscScan, NULL, 0x2000, 240, 320, 3, 4 }; @@ -6506,6 +6504,6 @@ struct BurnDriver BurnDrvVolfiedu = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_TAITO_MISC, GBF_PUZZLE, 0, NULL, VolfieduRomInfo, VolfieduRomName, NULL, NULL, VolfiedInputInfo, VolfieduDIPInfo, - VolfiedInit, TaitoMiscExit, JumpingFrame, NULL, TaitoMiscScan, + VolfiedInit, TaitoMiscExit, JumpingFrame, VolfiedDraw, TaitoMiscScan, NULL, 0x2000, 240, 320, 3, 4 }; diff --git a/src/burn/drv/taito/d_taitox.cpp b/src/burn/drv/taito/d_taitox.cpp index 0833455ee..930165cf3 100644 --- a/src/burn/drv/taito/d_taitox.cpp +++ b/src/burn/drv/taito/d_taitox.cpp @@ -1434,7 +1434,7 @@ static void TaitoXDrawSprites() } -static void TaitoXDraw() +static INT32 TaitoXDraw() { TaitoXCalcPalette(); @@ -1445,6 +1445,8 @@ static void TaitoXDraw() TaitoXDrawBgSprites(); TaitoXDrawSprites(); BurnTransferCopy(TaitoPalette); + + return 0; } static INT32 TaitoXFrame() @@ -1604,7 +1606,7 @@ struct BurnDriver BurnDrvBallbros = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_TAITOX, GBF_PUZZLE, 0, NULL, BallbrosRomInfo, BallbrosRomName, NULL, NULL, TwinhawkInputInfo, BallbrosDIPInfo, - BallbrosInit, TaitoXExit, TaitoXFrame, NULL, TaitoXScan, + BallbrosInit, TaitoXExit, TaitoXFrame, TaitoXDraw, TaitoXScan, NULL, 0x800, 384, 240, 4, 3 }; @@ -1614,7 +1616,7 @@ struct BurnDriver BurnDrvGigandes = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_TAITOX, GBF_HORSHOOT, 0, NULL, GigandesRomInfo, GigandesRomName, NULL, NULL, TwinhawkInputInfo, GigandesDIPInfo, - GigandesInit, TaitoXExit, TaitoXFrame, NULL, TaitoXScan, + GigandesInit, TaitoXExit, TaitoXFrame, TaitoXDraw, TaitoXScan, NULL, 0x800, 384, 240, 4, 3 }; @@ -1624,7 +1626,7 @@ struct BurnDriver BurnDrvGigandesa = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOX, GBF_HORSHOOT, 0, NULL, GigandesaRomInfo, GigandesaRomName, NULL, NULL, TwinhawkInputInfo, GigandesDIPInfo, - GigandesInit, TaitoXExit, TaitoXFrame, NULL, TaitoXScan, + GigandesInit, TaitoXExit, TaitoXFrame, TaitoXDraw, TaitoXScan, NULL, 0x800, 384, 240, 4, 3 }; @@ -1634,7 +1636,7 @@ struct BurnDriver BurnDrvKyustrkr = { L"Last Striker\0Final \u7A76\u6975 \u306E Striker\0", NULL, NULL, NULL, BDF_GAME_WORKING | BDF_ORIENTATION_FLIPPED, 2, HARDWARE_TAITO_TAITOX, GBF_SPORTSFOOTBALL, 0, NULL, KyustrkrRomInfo, KyustrkrRomName, NULL, NULL, TwinhawkInputInfo, KyustrkrDIPInfo, - BallbrosInit, TaitoXExit, TaitoXFrame, NULL, TaitoXScan, + BallbrosInit, TaitoXExit, TaitoXFrame, TaitoXDraw, TaitoXScan, NULL, 0x800, 384, 240, 4, 3 }; @@ -1644,7 +1646,7 @@ struct BurnDriver BurnDrvSuperman = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_TAITOX, GBF_SCRFIGHT, 0, NULL, SupermanRomInfo, SupermanRomName, NULL, NULL, SupermanInputInfo, SupermanDIPInfo, - SupermanInit, TaitoXExit, TaitoXFrame, NULL, TaitoXScan, + SupermanInit, TaitoXExit, TaitoXFrame, TaitoXDraw, TaitoXScan, NULL, 0x800, 384, 240, 4, 3 }; @@ -1654,7 +1656,7 @@ struct BurnDriver BurnDrvSupermanu = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOX, GBF_SCRFIGHT, 0, NULL, SupermanuRomInfo, SupermanuRomName, NULL, NULL, SupermanInputInfo, SupermanuDIPInfo, - SupermanInit, TaitoXExit, TaitoXFrame, NULL, TaitoXScan, + SupermanInit, TaitoXExit, TaitoXFrame, TaitoXDraw, TaitoXScan, NULL, 0x800, 384, 240, 4, 3 }; @@ -1664,7 +1666,7 @@ struct BurnDriver BurnDrvSupermanj = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOX, GBF_SCRFIGHT, 0, NULL, SupermanjRomInfo, SupermanjRomName, NULL, NULL, SupermanInputInfo, SupermanjDIPInfo, - SupermanInit, TaitoXExit, TaitoXFrame, NULL, TaitoXScan, + SupermanInit, TaitoXExit, TaitoXFrame, TaitoXDraw, TaitoXScan, NULL, 0x800, 384, 240, 4, 3 }; @@ -1674,7 +1676,7 @@ struct BurnDriver BurnDrvTwinhawk = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_TAITO_TAITOX, GBF_VERSHOOT, 0, NULL, TwinhawkRomInfo, TwinhawkRomName, NULL, NULL, TwinhawkInputInfo, TwinhawkDIPInfo, - TwinhawkInit, TaitoXExit, TwinhawkFrame, NULL, TaitoXScan, + TwinhawkInit, TaitoXExit, TwinhawkFrame, TaitoXDraw, TaitoXScan, NULL, 0x800, 224, 384, 3, 4 }; @@ -1684,7 +1686,7 @@ struct BurnDriver BurnDrvTwinhawku = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_TAITO_TAITOX, GBF_VERSHOOT, 0, NULL, TwinhawkuRomInfo, TwinhawkuRomName, NULL, NULL, TwinhawkInputInfo, TwinhawkuDIPInfo, - TwinhawkInit, TaitoXExit, TwinhawkFrame, NULL, TaitoXScan, + TwinhawkInit, TaitoXExit, TwinhawkFrame, TaitoXDraw, TaitoXScan, NULL, 0x800, 224, 384, 3, 4 }; @@ -1694,6 +1696,6 @@ struct BurnDriver BurnDrvDaisenpu = { L"\u5927\u65CB\u98A8 (Japan)\0Daisenpu\0", NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL, 2, HARDWARE_TAITO_TAITOX, GBF_VERSHOOT, 0, NULL, DaisenpuRomInfo, DaisenpuRomName, NULL, NULL, TwinhawkInputInfo, DaisenpuDIPInfo, - TwinhawkInit, TaitoXExit, TwinhawkFrame, NULL, TaitoXScan, + TwinhawkInit, TaitoXExit, TwinhawkFrame, TaitoXDraw, TaitoXScan, NULL, 0x800, 224, 384, 3, 4 }; diff --git a/src/burn/drv/taito/d_taitoz.cpp b/src/burn/drv/taito/d_taitoz.cpp index 8fc64744a..f28b86398 100644 --- a/src/burn/drv/taito/d_taitoz.cpp +++ b/src/burn/drv/taito/d_taitoz.cpp @@ -19,16 +19,6 @@ static INT32 bUseGun = 0; static double TaitoZYM2610Route1MasterVol; static double TaitoZYM2610Route2MasterVol; -static void AquajackDraw(); -static void BsharkDraw(); -static void ChasehqDraw(); -static void ContcircDraw(); -static void DblaxleDraw(); -static void EnforceDraw(); -static void RacingbDraw(); -static void SciDraw(); -static void SpacegunDraw(); - #ifdef BUILD_A68K static bool bUseAsm68KCoreOldValue = false; #endif @@ -4862,7 +4852,6 @@ static INT32 AquajackInit() bYM2610UseSeperateVolumes = 1; TaitoMakeInputsFunction = AquajackMakeInputs; - TaitoDrawFunction = AquajackDraw; TaitoIrqLine = 4; TaitoFrameInterleave = 500; @@ -4956,7 +4945,6 @@ static INT32 BsharkInit() BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH); TaitoMakeInputsFunction = BsharkMakeInputs; - TaitoDrawFunction = BsharkDraw; TaitoIrqLine = 4; TaitoFrameInterleave = 271; TaitoFlipScreenX = 1; @@ -5070,7 +5058,6 @@ static INT32 ChasehqInit() bYM2610UseSeperateVolumes = 1; TaitoMakeInputsFunction = ChasehqMakeInputs; - TaitoDrawFunction = ChasehqDraw; TaitoIrqLine = 4; TaitoFrameInterleave = 100; @@ -5171,7 +5158,6 @@ static INT32 ContcircInit() bYM2610UseSeperateVolumes = 1; TaitoMakeInputsFunction = ContcircMakeInputs; - TaitoDrawFunction = ContcircDraw; TaitoIrqLine = 6; TaitoFrameInterleave = 100; @@ -5269,7 +5255,6 @@ static INT32 DblaxleInit() bYM2610UseSeperateVolumes = 1; TaitoMakeInputsFunction = DblaxleMakeInputs; - TaitoDrawFunction = DblaxleDraw; TaitoIrqLine = 4; TaitoFrameInterleave = 100; @@ -5373,7 +5358,6 @@ static INT32 EnforceInit() bYM2610UseSeperateVolumes = 1; TaitoMakeInputsFunction = EnforceMakeInputs; - TaitoDrawFunction = EnforceDraw; TaitoIrqLine = 6; TaitoFrameInterleave = 100; @@ -5480,7 +5464,6 @@ static INT32 NightstrInit() bYM2610UseSeperateVolumes = 1; TaitoMakeInputsFunction = NightstrMakeInputs; - TaitoDrawFunction = ChasehqDraw; TaitoIrqLine = 4; TaitoFrameInterleave = 100; @@ -5577,7 +5560,6 @@ static INT32 RacingbInit() bYM2610UseSeperateVolumes = 1; TaitoMakeInputsFunction = DblaxleMakeInputs; - TaitoDrawFunction = RacingbDraw; TaitoIrqLine = 4; TaitoFrameInterleave = 100; @@ -5680,7 +5662,6 @@ static INT32 SciInit() bYM2610UseSeperateVolumes = 1; TaitoMakeInputsFunction = SciMakeInputs; - TaitoDrawFunction = SciDraw; TaitoIrqLine = 4; TaitoFrameInterleave = 100; @@ -5777,7 +5758,6 @@ static INT32 SpacegunInit() if (!EEPROMAvailable()) EEPROMFill(spacegun_default_eeprom, 0, 128); TaitoMakeInputsFunction = SpacegunMakeInputs; - TaitoDrawFunction = SpacegunDraw; TaitoIrqLine = 4; TaitoFrameInterleave = 100; TaitoFlipScreenX = 1; @@ -6540,7 +6520,7 @@ static void SpacegunRenderSprites(INT32 PriorityDraw) } } -static void AquajackDraw() +static INT32 AquajackDraw() { INT32 Disable = TC0100SCNCtrl[0][6] & 0xf7; BurnTransferClear(); @@ -6563,9 +6543,11 @@ static void AquajackDraw() if (!(Disable & 0x04)) TC0100SCNRenderCharLayer(0); BurnTransferCopy(TC0110PCRPalette); + + return 0; } -static void BsharkDraw() +static INT32 BsharkDraw() { INT32 Disable = TC0100SCNCtrl[0][6] & 0xf7; @@ -6588,9 +6570,11 @@ static void BsharkDraw() if (!(Disable & 0x04)) TC0100SCNRenderCharLayer(0); BurnTransferCopy(TaitoPalette); + + return 0; } -static void ChasehqDraw() +static INT32 ChasehqDraw() { INT32 Disable = TC0100SCNCtrl[0][6] & 0xf7; @@ -6614,9 +6598,11 @@ static void ChasehqDraw() BurnTransferCopy(TC0110PCRPalette); if (bUseShifter) BurnShiftRender(); + + return 0; } -static void ContcircDraw() +static INT32 ContcircDraw() { INT32 Disable = TC0100SCNCtrl[0][6] & 0xf7; @@ -6640,9 +6626,11 @@ static void ContcircDraw() if (!(Disable & 0x04)) TC0100SCNRenderCharLayer(0); BurnTransferCopy(TC0110PCRPalette); BurnShiftRender(); + + return 0; } -static void EnforceDraw() +static INT32 EnforceDraw() { INT32 Disable = TC0100SCNCtrl[0][6] & 0xf7; @@ -6665,9 +6653,11 @@ static void EnforceDraw() if (!(Disable & 0x04)) TC0100SCNRenderCharLayer(0); BurnTransferCopy(TC0110PCRPalette); + + return 0; } -static void DblaxleDraw() +static INT32 DblaxleDraw() { UINT8 Layer[4]; UINT16 Priority = TC0480SCPGetBgPriority(); @@ -6695,9 +6685,11 @@ static void DblaxleDraw() TC0480SCPRenderCharLayer(); BurnTransferCopy(TaitoPalette); BurnShiftRender(); + + return 0; } -static void RacingbDraw() +static INT32 RacingbDraw() { UINT8 Layer[4]; UINT16 Priority = TC0480SCPGetBgPriority(); @@ -6720,9 +6712,11 @@ static void RacingbDraw() TC0480SCPRenderCharLayer(); BurnTransferCopy(TaitoPalette); BurnShiftRender(); + + return 0; } -static void SciDraw() +static INT32 SciDraw() { INT32 Disable = TC0100SCNCtrl[0][6] & 0xf7; @@ -6747,9 +6741,11 @@ static void SciDraw() BurnTransferCopy(TaitoPalette); BurnShiftRender(); + + return 0; } -static void SpacegunDraw() +static INT32 SpacegunDraw() { INT32 Disable = TC0100SCNCtrl[0][6] & 0xf7; @@ -6774,6 +6770,8 @@ static void SpacegunDraw() for (INT32 i = 0; i < nBurnGunNumPlayers; i++) { BurnGunDrawTarget(i, BurnGunX[i] >> 8, BurnGunY[i] >> 8); } + + return 0; } static INT32 TaitoZFrame() @@ -6841,7 +6839,7 @@ static INT32 TaitoZFrame() SekClose(); } - if (pBurnDraw) TaitoDrawFunction(); + if (pBurnDraw) BurnDrvRedraw(); return 0; } @@ -6907,7 +6905,7 @@ struct BurnDriver BurnDrvAquajack = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_TAITOZ, GBF_SHOOT, 0, NULL, AquajackRomInfo, AquajackRomName, NULL, NULL, AquajackInputInfo, AquajackDIPInfo, - AquajackInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + AquajackInit, TaitoZExit, TaitoZFrame, AquajackDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -6917,7 +6915,7 @@ struct BurnDriver BurnDrvAquajackj = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_SHOOT, 0, NULL, AquajackjRomInfo, AquajackjRomName, NULL, NULL, AquajackInputInfo, AquajackjDIPInfo, - AquajackInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + AquajackInit, TaitoZExit, TaitoZFrame, AquajackDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -6927,7 +6925,7 @@ struct BurnDriver BurnDrvAquajacku = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_SHOOT, 0, NULL, AquajackuRomInfo, AquajackuRomName, NULL, NULL, AquajackInputInfo, AquajackjDIPInfo, - AquajackInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + AquajackInit, TaitoZExit, TaitoZFrame, AquajackDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -6937,7 +6935,7 @@ struct BurnDriver BurnDrvBshark = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_TAITOZ, GBF_SHOOT, 0, NULL, BsharkRomInfo, BsharkRomName, NULL, NULL, BsharkInputInfo, BsharkDIPInfo, - BsharkInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + BsharkInit, TaitoZExit, TaitoZFrame, BsharkDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -6947,7 +6945,7 @@ struct BurnDriver BurnDrvBsharkj = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_SHOOT, 0, NULL, BsharkjRomInfo, BsharkjRomName, NULL, NULL, BsharkInputInfo, BsharkjDIPInfo, - BsharkInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + BsharkInit, TaitoZExit, TaitoZFrame, BsharkDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -6957,7 +6955,7 @@ struct BurnDriver BurnDrvBsharkjjs = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_SHOOT, 0, NULL, BsharkjjsRomInfo, BsharkjjsRomName, NULL, NULL, BsharkjjsInputInfo, BsharkjjsDIPInfo, - BsharkInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + BsharkInit, TaitoZExit, TaitoZFrame, BsharkDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -6967,7 +6965,7 @@ struct BurnDriver BurnDrvBsharku = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_SHOOT, 0, NULL, BsharkuRomInfo, BsharkuRomName, NULL, NULL, BsharkInputInfo, BsharkuDIPInfo, - BsharkInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + BsharkInit, TaitoZExit, TaitoZFrame, BsharkDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -6977,7 +6975,7 @@ struct BurnDriver BurnDrvChasehq = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, ChasehqRomInfo, ChasehqRomName, NULL, NULL, ChasehqInputInfo, ChasehqDIPInfo, - ChasehqInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + ChasehqInit, TaitoZExit, TaitoZFrame, ChasehqDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -6987,7 +6985,7 @@ struct BurnDriver BurnDrvChasehqj = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, ChasehqjRomInfo, ChasehqjRomName, NULL, NULL, ChasehqInputInfo, ChasehqjDIPInfo, - ChasehqInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + ChasehqInit, TaitoZExit, TaitoZFrame, ChasehqDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -6997,7 +6995,7 @@ struct BurnDriver BurnDrvChasehqju = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, ChasehqjuRomInfo, ChasehqjuRomName, NULL, NULL, ChasehqInputInfo, ChasehqjDIPInfo, - ChasehqInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + ChasehqInit, TaitoZExit, TaitoZFrame, ChasehqDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -7007,7 +7005,7 @@ struct BurnDriver BurnDrvChasehqu = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, ChasehquRomInfo, ChasehquRomName, NULL, NULL, ChasehqInputInfo, ChasehqDIPInfo, - ChasehqInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + ChasehqInit, TaitoZExit, TaitoZFrame, ChasehqDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -7017,7 +7015,7 @@ struct BurnDriver BurnDrvContcirc = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, ContcircRomInfo, ContcircRomName, NULL, NULL, ContcircInputInfo, ContcircDIPInfo, - ContcircInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + ContcircInit, TaitoZExit, TaitoZFrame, ContcircDraw, TaitoZScan, NULL, 0x1000, 320, 224, 4, 3 }; @@ -7027,7 +7025,7 @@ struct BurnDriver BurnDrvContcircu = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, ContcircuRomInfo, ContcircuRomName, NULL, NULL, ContcircInputInfo, ContcircuDIPInfo, - ContcircInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + ContcircInit, TaitoZExit, TaitoZFrame, ContcircDraw, TaitoZScan, NULL, 0x1000, 320, 224, 4, 3 }; @@ -7037,7 +7035,7 @@ struct BurnDriver BurnDrvContcircua = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, ContcircuaRomInfo, ContcircuaRomName, NULL, NULL, ContcircInputInfo, ContcircjDIPInfo, - ContcircInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + ContcircInit, TaitoZExit, TaitoZFrame, ContcircDraw, TaitoZScan, NULL, 0x1000, 320, 224, 4, 3 }; @@ -7047,7 +7045,7 @@ struct BurnDriver BurnDrvContcircj = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, ContcircjRomInfo, ContcircjRomName, NULL, NULL, ContcircInputInfo, ContcircjDIPInfo, - ContcircInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + ContcircInit, TaitoZExit, TaitoZFrame, ContcircDraw, TaitoZScan, NULL, 0x1000, 320, 224, 4, 3 }; @@ -7057,7 +7055,7 @@ struct BurnDriver BurnDrvDblaxle = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, DblaxleRomInfo, DblaxleRomName, NULL, NULL, DblaxleInputInfo, DblaxleDIPInfo, - DblaxleInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + DblaxleInit, TaitoZExit, TaitoZFrame, DblaxleDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -7067,7 +7065,7 @@ struct BurnDriver BurnDrvDblaxleu = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, DblaxleuRomInfo, DblaxleuRomName, NULL, NULL, DblaxleInputInfo, DblaxleDIPInfo, - DblaxleInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + DblaxleInit, TaitoZExit, TaitoZFrame, DblaxleDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -7077,7 +7075,7 @@ struct BurnDriver BurnDrvPwheelsj = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, PwheelsjRomInfo, PwheelsjRomName, NULL, NULL, DblaxleInputInfo, PwheelsjDIPInfo, - DblaxleInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + DblaxleInit, TaitoZExit, TaitoZFrame, DblaxleDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -7087,7 +7085,7 @@ struct BurnDriver BurnDrvEnforce = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_TAITOZ, GBF_SHOOT, 0, NULL, EnforceRomInfo, EnforceRomName, NULL, NULL, EnforceInputInfo, EnforceDIPInfo, - EnforceInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + EnforceInit, TaitoZExit, TaitoZFrame, EnforceDraw, TaitoZScan, NULL, 0x1000, 320, 224, 4, 3 }; @@ -7097,7 +7095,7 @@ struct BurnDriver BurnDrvEnforcej = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_SHOOT, 0, NULL, EnforcejRomInfo, EnforcejRomName, NULL, NULL, EnforceInputInfo, EnforcejDIPInfo, - EnforceInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + EnforceInit, TaitoZExit, TaitoZFrame, EnforceDraw, TaitoZScan, NULL, 0x1000, 320, 224, 4, 3 }; @@ -7107,7 +7105,7 @@ struct BurnDriver BurnDrvEnforceja = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_SHOOT, 0, NULL, EnforcejaRomInfo, EnforcejaRomName, NULL, NULL, EnforceInputInfo, EnforcejaDIPInfo, - EnforceInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + EnforceInit, TaitoZExit, TaitoZFrame, EnforceDraw, TaitoZScan, NULL, 0x1000, 320, 224, 4, 3 }; @@ -7117,7 +7115,7 @@ struct BurnDriver BurnDrvNightstr = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_TAITOZ, GBF_SHOOT, 0, NULL, NightstrRomInfo, NightstrRomName, NULL, NULL, NightstrInputInfo, NightstrDIPInfo, - NightstrInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + NightstrInit, TaitoZExit, TaitoZFrame, ChasehqDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -7127,7 +7125,7 @@ struct BurnDriver BurnDrvNightstrj = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, NightstrjRomInfo, NightstrjRomName, NULL, NULL, NightstrInputInfo, NightstrjDIPInfo, - NightstrInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + NightstrInit, TaitoZExit, TaitoZFrame, ChasehqDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -7137,7 +7135,7 @@ struct BurnDriver BurnDrvNightstru = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, NightstruRomInfo, NightstruRomName, NULL, NULL, NightstrInputInfo, NightstruDIPInfo, - NightstrInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + NightstrInit, TaitoZExit, TaitoZFrame, ChasehqDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -7147,7 +7145,7 @@ struct BurnDriver BurnDrvRacingb = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, RacingbRomInfo, RacingbRomName, NULL, NULL, RacingbInputInfo, RacingbDIPInfo, - RacingbInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + RacingbInit, TaitoZExit, TaitoZFrame, RacingbDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -7157,7 +7155,7 @@ struct BurnDriver BurnDrvRacingbj = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, RacingbjRomInfo, RacingbjRomName, NULL, NULL, RacingbInputInfo, RacingbDIPInfo, - RacingbInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + RacingbInit, TaitoZExit, TaitoZFrame, RacingbDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -7167,7 +7165,7 @@ struct BurnDriver BurnDrvSci = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, SciRomInfo, SciRomName, NULL, NULL, SciInputInfo, SciDIPInfo, - SciInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + SciInit, TaitoZExit, TaitoZFrame, SciDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -7177,7 +7175,7 @@ struct BurnDriver BurnDrvScia = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, SciaRomInfo, SciaRomName, NULL, NULL, SciInputInfo, SciDIPInfo, - SciInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + SciInit, TaitoZExit, TaitoZFrame, SciDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -7187,7 +7185,7 @@ struct BurnDriver BurnDrvScij = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, ScijRomInfo, ScijRomName, NULL, NULL, SciInputInfo, ScijDIPInfo, - SciInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + SciInit, TaitoZExit, TaitoZFrame, SciDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -7197,7 +7195,7 @@ struct BurnDriver BurnDrvSciu = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, SciuRomInfo, SciuRomName, NULL, NULL, SciInputInfo, SciuDIPInfo, - SciInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + SciInit, TaitoZExit, TaitoZFrame, SciDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -7207,7 +7205,7 @@ struct BurnDriver BurnDrvScinegro = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_TAITO_TAITOZ, GBF_RACING, 0, NULL, ScinegroRomInfo, ScinegroRomName, NULL, NULL, SciInputInfo, SciDIPInfo, - SciInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + SciInit, TaitoZExit, TaitoZFrame, SciDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -7217,7 +7215,7 @@ struct BurnDriver BurnDrvSpacegun = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING, 2, HARDWARE_TAITO_TAITOZ, GBF_SHOOT, 0, NULL, SpacegunRomInfo, SpacegunRomName, NULL, NULL, SpacegunInputInfo, SpacegunDIPInfo, - SpacegunInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + SpacegunInit, TaitoZExit, TaitoZFrame, SpacegunDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -7227,7 +7225,7 @@ struct BurnDriver BurnDrvSpacegunj = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_SHOOT, 0, NULL, SpacegunjRomInfo, SpacegunjRomName, NULL, NULL, SpacegunInputInfo, SpacegunjDIPInfo, - SpacegunInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + SpacegunInit, TaitoZExit, TaitoZFrame, SpacegunDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 }; @@ -7237,6 +7235,6 @@ struct BurnDriver BurnDrvSpacegunu = { NULL, NULL, NULL, NULL, BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_TAITOZ, GBF_SHOOT, 0, NULL, SpacegunuRomInfo, SpacegunuRomName, NULL, NULL, SpacegunInputInfo, SpacegunuDIPInfo, - SpacegunInit, TaitoZExit, TaitoZFrame, NULL, TaitoZScan, + SpacegunInit, TaitoZExit, TaitoZFrame, SpacegunDraw, TaitoZScan, NULL, 0x1000, 320, 240, 4, 3 };