Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 08:22:15 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix debug compile (nw)

Browse Source
This commit is contained in:
David Haywood 2016-01-26 03:17:01 +00:00
parent 665ff7216c
commit c01f6b3c35
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mame/includes/dynax.h
View File

@ -53,7 +53,7 @@ public:
optional_region_ptr<UINT8> m_gfx_region7;
optional_region_ptr<UINT8> m_gfx_region8;
static memory_region * gfxregions[];
memory_region * m_gfxregions[8];
// up to 8 layers, 2 images per layer (interleaved on screen)
std::unique_ptr<UINT8[]> m_pixmap[8][2];

27
src/mame/video/dynax.cpp
View File

@ -546,14 +546,13 @@ int dynax_state::blitter_drawgfx( int layer, int mask, memory_region *gfx, int s
void dynax_state::dynax_blitter_start(int flags )
{
int blit_newsrc;
memory_region * gfxregions[] = { memregion("gfx1"), memregion("gfx2"), memregion("gfx3"), memregion("gfx4"), memregion("gfx5"), memregion("gfx6"), memregion("gfx7"), memregion("gfx8") };
LOG(("XY=%X,%X SRC=%X BLIT=%X\n", m_blit_x, m_blit_y, m_blit_src, flags));
blit_newsrc = blitter_drawgfx(
0, // layer
m_blit_dest, // layer mask
gfxregions[m_blit_romregion], // rom region
m_gfxregions[m_blit_romregion], // rom region
m_blit_src, // rom address
m_blit_pen, // pen
m_blit_x, m_blit_y, // x,y
@ -574,14 +573,13 @@ void dynax_state::dynax_blitter_start(int flags )
void dynax_state::jantouki_blitter_start( int flags )
{
int blit_newsrc;
memory_region * gfxregions[] = { memregion("gfx1"), memregion("gfx2"), memregion("gfx3"), memregion("gfx4"), memregion("gfx5"), memregion("gfx6"), memregion("gfx7"), memregion("gfx8") };
LOG(("XY=%X,%X SRC=%X BLIT=%X\n", m_blit_x, m_blit_y, m_blit_src, flags));
blit_newsrc = blitter_drawgfx(
0, // layer
m_blit_dest, // layer mask
gfxregions[m_blit_romregion], // rom region
m_gfxregions[m_blit_romregion], // rom region
m_blit_src, // rom address
m_blit_pen, // pen
m_blit_x, m_blit_y, // x,y
@ -602,14 +600,13 @@ void dynax_state::jantouki_blitter_start( int flags )
void dynax_state::jantouki_blitter2_start( int flags )
{
int blit2_newsrc;
memory_region * gfxregions[] = { memregion("gfx1"), memregion("gfx2"), memregion("gfx3"), memregion("gfx4"), memregion("gfx5"), memregion("gfx6"), memregion("gfx7"), memregion("gfx8") };
LOG(("XY'=%X,%X SRC'=%X BLIT'=%02X\n", m_blit2_x, m_blit2_y, m_blit2_src, flags));
blit2_newsrc = blitter_drawgfx(
4, // layer
m_blit2_dest, // layer mask
gfxregions[m_blit2_romregion], // rom region
m_gfxregions[m_blit2_romregion], // rom region
m_blit2_src, // rom address
m_blit2_pen, // pen
m_blit2_x, m_blit2_y, // x,y
@ -796,6 +793,16 @@ static const int priority_mjembase[8] = { 0x0231, 0x2031, 0x0321, 0x3021, 0x2301
void dynax_state::dynax_common_reset()
{
m_gfxregions[0] = memregion("gfx1");
m_gfxregions[1] = memregion("gfx2");
m_gfxregions[2] = memregion("gfx3");
m_gfxregions[3] = memregion("gfx4");
m_gfxregions[4] = memregion("gfx5");
m_gfxregions[5] = memregion("gfx6");
m_gfxregions[6] = memregion("gfx7");
m_gfxregions[7] = memregion("gfx8");
m_blit_romregion = 0;
m_blit2_romregion = 0;
m_blit_dest = -1;
@ -1265,10 +1272,10 @@ int dynax_state::debug_viewer(bitmap_ind16 &bitmap, const rectangle &cliprect )
#ifdef MAME_DEBUG
static int toggle;
if (machine().input().code_pressed_once(KEYCODE_T)) toggle = 1 - toggle;
if (toggle)
if (m_gfxregions[0] && toggle)
{
UINT8 *RAM = memregion( "gfx1" )->base();
size_t size = memregion( "gfx1" )->bytes();
UINT8 *RAM = m_gfxregions[0]->base();
size_t size = m_gfxregions[0]->bytes();
static int i = 0, c = 0, r = 0;
if (machine().input().code_pressed_once(KEYCODE_I)) c = (c - 1) & 0x1f;
@ -1292,7 +1299,7 @@ int dynax_state::debug_viewer(bitmap_ind16 &bitmap, const rectangle &cliprect )
if (m_layer_layout != LAYOUT_MJDIALQ2)
memset(m_pixmap[0][1].get(), 0, sizeof(UINT8) * 0x100 * 0x100);
for (m_hanamai_layer_half = 0; m_hanamai_layer_half < 2; m_hanamai_layer_half++)
blitter_drawgfx(0, 1, "gfx1", i, 0, cliprect.min_x, cliprect.min_y, 3, 0);
blitter_drawgfx(0, 1, m_gfxregions[0], i, 0, cliprect.min_x, cliprect.min_y, 3, 0);
if (m_layer_layout != LAYOUT_MJDIALQ2)
hanamai_copylayer(bitmap, cliprect, 0);