From 2f470543647e9b9d514bde49dde29922b6f6e630 Mon Sep 17 00:00:00 2001 From: David Haywood Date: Tue, 16 Jul 2013 10:51:16 +0000 Subject: [PATCH] move more bits (nw) --- src/mame/includes/konamigx.h | 1 - src/mame/video/k053246_k053247_k055673.c | 6 +++++- src/mame/video/k053246_k053247_k055673.h | 2 +- src/mame/video/konamigx.c | 9 +-------- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index 88188aa2aa2..4b46e11d893 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -117,7 +117,6 @@ public: tilemap_t *sub1, int sub1flags, tilemap_t *sub2, int sub2flags, int mixerflags, bitmap_ind16 *extra_bitmap, int rushingheroes_hack, - int offx, int offy, struct GX_OBJ *objpool, int *objbuf, int nobj diff --git a/src/mame/video/k053246_k053247_k055673.c b/src/mame/video/k053246_k053247_k055673.c index 54af4ff6646..abe901071f9 100644 --- a/src/mame/video/k053246_k053247_k055673.c +++ b/src/mame/video/k053246_k053247_k055673.c @@ -1211,7 +1211,7 @@ void k053247_device::zdrawgfxzoom32GP( void k053247_device::k053247_draw_single_sprite_gxcore( bitmap_rgb32 &bitmap, const rectangle &cliprect, - UINT8* gx_objzbuf, UINT8* gx_shdzbuf, int code, UINT16 *gx_spriteram, int offs, int k053246_objset1, int screenwidth, int offx, int offy, + UINT8* gx_objzbuf, UINT8* gx_shdzbuf, int code, UINT16 *gx_spriteram, int offs, int k053246_objset1, int screenwidth, int color, int alpha, int drawmode, int zcode, int pri ) { static const int xoffset[8] = { 0, 1, 4, 5, 16, 17, 20, 21 }; @@ -1285,6 +1285,10 @@ void k053247_device::k053247_draw_single_sprite_gxcore( bitmap_rgb32 &bitmap, co } + // get "display window" offsets + int offx = (k053246_read_register(0)<<8 | k053246_read_register(1)) & 0x3ff; + int offy = (k053246_read_register(2)<<8 | k053246_read_register(3)) & 0x3ff; + // apply wrapping and global offsets temp = wrapsize-1; diff --git a/src/mame/video/k053246_k053247_k055673.h b/src/mame/video/k053246_k053247_k055673.h index 9e2aae008d6..02231af3585 100644 --- a/src/mame/video/k053246_k053247_k055673.h +++ b/src/mame/video/k053246_k053247_k055673.h @@ -132,7 +132,7 @@ public: void k053247_draw_single_sprite_gxcore( bitmap_rgb32 &bitmap, const rectangle &cliprect, - UINT8* gx_objzbuf, UINT8* gx_shdzbuf, int code, UINT16 *gx_spriteram, int offs, int k053246_objset1, int screenwidth, int offx, int offy, + UINT8* gx_objzbuf, UINT8* gx_shdzbuf, int code, UINT16 *gx_spriteram, int offs, int k053246_objset1, int screenwidth, int color, int alpha, int drawmode, int zcode, int pri ); protected: diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c index 665e14a1eb2..8a250c7a1c1 100644 --- a/src/mame/video/konamigx.c +++ b/src/mame/video/konamigx.c @@ -402,7 +402,6 @@ void konamigx_state::konamigx_mixer(running_machine &machine, bitmap_rgb32 &bitm int objbuf[GX_MAX_OBJECTS]; int shadowon[3], shdpri[3], layerid[6], layerpri[6]; - int offx, offy; struct GX_OBJ *objpool, *objptr; int cltc_shdpri, /*prflp,*/ disp; @@ -442,10 +441,6 @@ void konamigx_state::konamigx_mixer(running_machine &machine, bitmap_rgb32 &bitm // cache global parameters konamigx_precache_registers(); - // get "display window" offsets - offx = (m_k055673->k053246_read_register(0)<<8 | m_k055673->k053246_read_register(1)) & 0x3ff; - offy = (m_k055673->k053246_read_register(2)<<8 | m_k055673->k053246_read_register(3)) & 0x3ff; - // init OBJSET2 and mixer parameters (see p.51 and chapter 7) layerid[0] = 0; layerid[1] = 1; layerid[2] = 2; layerid[3] = 3; layerid[4] = 4; layerid[5] = 5; @@ -725,7 +720,6 @@ void konamigx_state::konamigx_mixer(running_machine &machine, bitmap_rgb32 &bitm konamigx_mixer_draw(machine,bitmap,cliprect,sub1,sub1flags,sub2,sub2flags,mixerflags,extra_bitmap,rushingheroes_hack, - offx, offy, objpool, objbuf, nobj @@ -899,7 +893,6 @@ void konamigx_state::konamigx_mixer_draw(running_machine &machine, bitmap_rgb32 int mixerflags, bitmap_ind16 *extra_bitmap, int rushingheroes_hack, /* passed from above function */ - int offx, int offy, struct GX_OBJ *objpool, int *objbuf, int nobj @@ -949,7 +942,7 @@ void konamigx_state::konamigx_mixer_draw(running_machine &machine, bitmap_rgb32 } - m_k055673->k053247_draw_single_sprite_gxcore( bitmap, cliprect, gx_objzbuf, gx_shdzbuf, code, gx_spriteram, offs, k053246_objset1, screenwidth, offx, offy, + m_k055673->k053247_draw_single_sprite_gxcore( bitmap, cliprect, gx_objzbuf, gx_shdzbuf, code, gx_spriteram, offs, k053246_objset1, screenwidth, color, alpha, drawmode, zcode, pri ); } /* the rest are tilemaps of various kinda */