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

Merge branch 'master' of https://github.com/mamedev/mame

Browse Source
This commit is contained in:
Scott Stone 2022-10-19 15:16:24 -04:00
commit f5c50383f9
4 changed files with 23 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mame/jaleco/fcombat.cpp
View File

@ -333,7 +333,6 @@ u32 fcombat_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, co
gfx->transpen(bitmap, cliprect, code2 + 16, color, xflip, yflip, x, y + gfx->height(), 0);
gfx->transpen(bitmap, cliprect, code2 + 16 * 2, color, xflip, yflip, x, y + 2 * gfx->height(), 0);
gfx->transpen(bitmap, cliprect, code2 + 16 * 3, color, xflip, yflip, x, y + 3 * gfx->height(), 0);
}
gfx->transpen(bitmap, cliprect, code, color, xflip, yflip, x, y, 0);

23
src/mame/jaleco/jalblend.cpp
View File

@ -20,8 +20,6 @@
DEVICE INTERFACE
*****************************************************************************/
DEFINE_DEVICE_TYPE(JALECO_BLEND, jaleco_blend_device, "jaleco_blend", "Jaleco Blending Device")
jaleco_blend_device::jaleco_blend_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
@ -96,8 +94,8 @@ rgb_t jaleco_blend_device::func(rgb_t dest, rgb_t addMe, u8 alpha)
template<class BitmapClass>
void jaleco_blend_device::drawgfx_common(palette_device &palette,BitmapClass &dest_bmp,const rectangle &clip,gfx_element *gfx,
u32 code,u32 color,bool flipx,bool flipy,int offsx,int offsy,
u8 transparent_color)
u32 code,u32 color,bool flipx,bool flipy,int offsx,int offsy,
u8 transparent_color)
{
/* Start drawing */
const pen_t *pal = &palette.pen(gfx->colorbase() + gfx->granularity() * (color % gfx->colors()));
@ -163,10 +161,15 @@ void jaleco_blend_device::drawgfx_common(palette_device &palette,BitmapClass &de
}
void jaleco_blend_device::drawgfx(palette_device &palette,bitmap_ind16 &dest_bmp,const rectangle &clip,gfx_element *gfx,
u32 code,u32 color,bool flipx,bool flipy,int offsx,int offsy,
u8 transparent_color)
{ jaleco_blend_device::drawgfx_common(palette,dest_bmp, clip, gfx, code, color, flipx, flipy, offsx, offsy, transparent_color); }
u32 code,u32 color,bool flipx,bool flipy,int offsx,int offsy,
u8 transparent_color)
{
jaleco_blend_device::drawgfx_common(palette,dest_bmp, clip, gfx, code, color, flipx, flipy, offsx, offsy, transparent_color);
}
void jaleco_blend_device::drawgfx(palette_device &palette,bitmap_rgb32 &dest_bmp,const rectangle &clip,gfx_element *gfx,
u32 code,u32 color,bool flipx,bool flipy,int offsx,int offsy,
u8 transparent_color)
{ jaleco_blend_device::drawgfx_common(palette,dest_bmp, clip, gfx, code, color, flipx, flipy, offsx, offsy, transparent_color); }
u32 code,u32 color,bool flipx,bool flipy,int offsx,int offsy,
u8 transparent_color)
{
jaleco_blend_device::drawgfx_common(palette,dest_bmp, clip, gfx, code, color, flipx, flipy, offsx, offsy, transparent_color);
}

12
src/mame/jaleco/jalblend.h
View File

@ -16,11 +16,11 @@ public:
rgb_t func(rgb_t dest, rgb_t addMe);
rgb_t func(rgb_t dest, rgb_t addMe, u8 alpha);
void drawgfx(palette_device &palette,bitmap_ind16 &dest_bmp,const rectangle &clip,gfx_element *gfx,
u32 code,u32 color,bool flipx,bool flipy,int offsx,int offsy,
u8 transparent_color);
u32 code,u32 color,bool flipx,bool flipy,int offsx,int offsy,
u8 transparent_color);
void drawgfx(palette_device &palette,bitmap_rgb32 &dest_bmp,const rectangle &clip,gfx_element *gfx,
u32 code,u32 color,bool flipx,bool flipy,int offsx,int offsy,
u8 transparent_color);
u32 code,u32 color,bool flipx,bool flipy,int offsx,int offsy,
u8 transparent_color);
protected:
// device-level overrides
@ -30,8 +30,8 @@ protected:
private:
template<class BitmapClass>
void drawgfx_common(palette_device &palette,BitmapClass &dest_bmp,const rectangle &clip,gfx_element *gfx,
u32 code,u32 color,bool flipx,bool flipy,int offsx,int offsy,
u8 transparent_color);
u32 code,u32 color,bool flipx,bool flipy,int offsx,int offsy,
u8 transparent_color);
};
DECLARE_DEVICE_TYPE(JALECO_BLEND, jaleco_blend_device)

25
src/mame/saitek/intchess.cpp
View File

@ -154,6 +154,10 @@ u32 intchess_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c
return 0;
}
static GFXDECODE_START( gfx_intchess )
GFXDECODE_ENTRY( "gfx", 0, gfx_8x8x1, 0, 2 )
GFXDECODE_END
void intchess_state::vram_w(offs_t offset, u8 data)
{
// d0-d2: sprite index
@ -266,27 +270,6 @@ INPUT_PORTS_END
/******************************************************************************
GFX Layouts
******************************************************************************/
static const gfx_layout layout_8x8 =
{
8,8,
RGN_FRAC(1,1),
1,
{ 0 },
{ STEP8(0,1) },
{ STEP8(0,8) },
8*8
};
static GFXDECODE_START( gfx_intchess )
GFXDECODE_ENTRY( "gfx", 0, layout_8x8, 0, 2 )
GFXDECODE_END
/******************************************************************************
Machine Configs
******************************************************************************/