Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-21 13:18:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

small fixes to backdrop color (mostly for cliffhanger)

Browse Source
This commit is contained in:
Michaël Banaan Ananas 2011-12-15 19:09:15 +00:00
parent ea6b44bbeb
commit 134f4b0d8a
3 changed files with 39 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/emu/video/tms9928a.c
View File

@ -13,6 +13,8 @@
** Improved over the years by MESS and MAME teams.
**
** Todo:
** - External VDP input and sync (pin 34/35 on 9918A)
** - Updates during mid-scanline, probably only used in some MSX1 demos
** - Colours are incorrect. [fixed by R Nabet ?]
** - Sprites 8-31 are ghosted/cloned in mode 3 when using less than
** three pattern tables. Exact behaviour is not known.
@ -154,6 +156,17 @@ void tms9928a_device::check_interrupt()
}
void tms9928a_device::update_backdrop()
{
// update backdrop colour on change
if (m_Regs[7] & 15)
palette_set_color(machine(), 0, tms9928a_palette[m_Regs[7] & 15]);
else
// transparent if EXTVID bit is set
palette_set_color(machine(), 0, MAKE_ARGB(m_Regs[0] & 1 ? 0 : 255,0,0,0));
}
void tms9928a_device::change_register(UINT8 reg, UINT8 val)
{
static const UINT8 Mask[8] =
@ -166,6 +179,7 @@ void tms9928a_device::change_register(UINT8 reg, UINT8 val)
"Mode 1+2+3 (BOGUS)"
};
UINT8 prev = m_Regs[reg];
val &= Mask[reg];
m_Regs[reg] = val;
@ -188,6 +202,8 @@ void tms9928a_device::change_register(UINT8 reg, UINT8 val)
m_pattern = (m_Regs[4] * 2048) & (m_vram_size - 1);
}
m_mode = ( (m_reva ? (m_Regs[0] & 2) : 0) | ((m_Regs[1] & 0x10)>>4) | ((m_Regs[1] & 8)>>1));
if ((val ^ prev) & 1)
update_backdrop();
logerror("TMS9928A('%s'): %s\n", tag(), modes[m_mode]);
break;
case 1:
@ -228,7 +244,8 @@ void tms9928a_device::change_register(UINT8 reg, UINT8 val)
m_spritepattern = (val * 2048) & (m_vram_size - 1);
break;
case 7:
/* The backdrop is updated at TMS9928A_refresh() */
if ((val ^ prev) & 15)
update_backdrop();
break;
}
}
@ -264,18 +281,6 @@ void tms9928a_device::device_timer(emu_timer &timer, device_timer_id id, int par
UINT16 BackColour = m_Regs[7] & 15;
UINT16 *p = BITMAP_ADDR16( m_tmpbmp, vpos, 0 );
if (!BackColour)
BackColour=1;
if ( vpos == 0 )
{
rgb_t oldcolor = palette_get_color(machine(), 0);
/* note we preserve the alpha here; this is so that it can be controlled independently */
/* see cliffhgr.c for an example */
palette_set_color(machine(), 0, (tms9928a_palette[BackColour] & MAKE_ARGB(0,255,255,255)) | (oldcolor & MAKE_ARGB(255,0,0,0)));
}
int y = vpos - m_top_border;
if ( y < 0 || y >= 192 || ! (m_Regs[1] & 0x40) )
@ -313,8 +318,8 @@ void tms9928a_device::device_timer(emu_timer &timer, device_timer_id id, int par
UINT8 charcode = m_vMem[ addr ];
UINT8 pattern = m_vMem[ m_pattern + ( charcode << 3 ) + ( y & 7 ) ];
UINT8 colour = m_vMem[ m_colour + ( charcode >> 3 ) ];
UINT16 fg = colour >> 4;
UINT16 bg = colour & 15;
UINT16 fg = (colour >> 4) ? : BackColour;
UINT16 bg = (colour & 15) ? : BackColour;
for ( int i = 0; i < 8; pattern <<= 1, i++ )
p[x+i] = ( pattern & 0x80 ) ? fg : bg;
@ -326,8 +331,8 @@ void tms9928a_device::device_timer(emu_timer &timer, device_timer_id id, int par
//if (vpos==100 ) popmessage("TMS9928A MODE 1");
{
UINT16 addr = m_nametbl + ( ( y >> 3 ) * 40 );
UINT16 fg = m_Regs[7] >> 4;
UINT16 bg = m_Regs[7] & 15;
UINT16 fg = (m_Regs[7] >> 4) ? : BackColour;
UINT16 bg = BackColour;
/* Extra 6 pixels left border */
for ( int x = TMS9928A_HORZ_DISPLAY_START; x < TMS9928A_HORZ_DISPLAY_START + 6; x++ )
@ -358,8 +363,8 @@ void tms9928a_device::device_timer(emu_timer &timer, device_timer_id id, int par
UINT16 charcode = m_vMem[ addr ] + ( ( y >> 6 ) << 8 );
UINT8 pattern = m_vMem[ m_pattern + ( ( charcode & m_patternmask ) << 3 ) + ( y & 7 ) ];
UINT8 colour = m_vMem[ m_colour + ( ( charcode & m_colourmask ) << 3 ) + ( y & 7 ) ];
UINT16 fg = colour >> 4;
UINT16 bg = colour & 15;
UINT16 fg = (colour >> 4) ? : BackColour;
UINT16 bg = (colour & 15) ? : BackColour;
for ( int i = 0; i < 8; pattern <<= 1, i++ )
p[x+i] = ( pattern & 0x80 ) ? fg : bg;
@ -371,8 +376,8 @@ void tms9928a_device::device_timer(emu_timer &timer, device_timer_id id, int par
//if (vpos==100) popmessage("TMS9928A MODE1+2");
{
UINT16 addr = m_nametbl + ( ( y >> 3 ) * 40 );
UINT16 fg = m_Regs[7] >> 4;
UINT16 bg = m_Regs[7] & 15;
UINT16 fg = (m_Regs[7] >> 4) ? : BackColour;
UINT16 bg = BackColour;
/* Extra 6 pixels left border */
for ( int x = TMS9928A_HORZ_DISPLAY_START; x < TMS9928A_HORZ_DISPLAY_START + 6; x++ )
@ -402,8 +407,8 @@ void tms9928a_device::device_timer(emu_timer &timer, device_timer_id id, int par
{
UINT8 charcode = m_vMem[ addr ];
UINT8 colour = m_vMem[ m_pattern + ( charcode << 3 ) + ( ( y >> 2 ) & 7 ) ];
UINT16 fg = colour >> 4;
UINT16 bg = colour & 15;
UINT16 fg = (colour >> 4) ? : BackColour;
UINT16 bg = (colour & 15) ? : BackColour;
p[x+0] = p[x+1] = p[x+2] = p[x+3] = fg;
p[x+4] = p[x+5] = p[x+6] = p[x+7] = bg;
@ -414,8 +419,8 @@ void tms9928a_device::device_timer(emu_timer &timer, device_timer_id id, int par
case 5: case 7: /* MODE bogus */
//if (vpos==100 ) popmessage("TMS9928A MODE bogus");
{
UINT16 fg = m_Regs[7] >> 4;
UINT16 bg = m_Regs[7] & 15;
UINT16 fg = (m_Regs[7] >> 4) ? : BackColour;
UINT16 bg = BackColour;
/* Extra 6 pixels left border */
for ( int x = TMS9928A_HORZ_DISPLAY_START; x < TMS9928A_HORZ_DISPLAY_START + 6; x++ )
@ -442,8 +447,8 @@ void tms9928a_device::device_timer(emu_timer &timer, device_timer_id id, int par
{
UINT8 charcode = m_vMem[ addr ];
UINT8 colour = m_vMem[ m_pattern + ( ( ( charcode + ( ( y >> 2 ) & 7 ) + ( ( y >> 6 ) << 8 ) ) & m_patternmask ) << 3 ) ];
UINT16 fg = colour >> 4;
UINT16 bg = colour & 15;
UINT16 fg = (colour >> 4) ? : BackColour;
UINT16 bg = (colour & 15) ? : BackColour;
p[x+0] = p[x+1] = p[x+2] = p[x+3] = fg;
p[x+4] = p[x+5] = p[x+6] = p[x+7] = bg;

5
src/emu/video/tms9928a.h
View File

@ -27,10 +27,10 @@
#define __TMS9928A_H__
#include "emu.h"
#include "machine//devhelpr.h"
#include "machine/devhelpr.h"
#define TMS9928A_PALETTE_SIZE 16
#define TMS9928A_PALETTE_SIZE 16
/* Some defines used in defining the screens */
@ -119,6 +119,7 @@ protected:
private:
void change_register(UINT8 reg, UINT8 val);
void check_interrupt();
void update_backdrop();
static const device_timer_id TIMER_LINE = 0;

21
src/mame/drivers/cliffhgr.c
View File

@ -146,24 +146,11 @@ static READ8_HANDLER( cliff_irq_ack_r )
static WRITE8_DEVICE_HANDLER( cliff_sound_overlay_w )
{
int sound = data & 3;
int overlay = (data & 0x10) ? 1 : 0;
/* configure pen 0 and 1 as transparent in the renderer and use it as the compositing color */
if (overlay)
{
palette_set_color(device->machine(), 0, palette_get_color(device->machine(), 0) & MAKE_ARGB(0,255,255,255));
palette_set_color(device->machine(), 1, palette_get_color(device->machine(), 1) & MAKE_ARGB(0,255,255,255));
}
else
{
palette_set_color(device->machine(), 0, palette_get_color(device->machine(), 0) | MAKE_ARGB(255,0,0,0));
palette_set_color(device->machine(), 1, palette_get_color(device->machine(), 1) | MAKE_ARGB(255,0,0,0));
}
/* audio */
discrete_sound_w(device, CLIFF_ENABLE_SND_1, sound & 1);
discrete_sound_w(device, CLIFF_ENABLE_SND_2, (sound >> 1) & 1);
discrete_sound_w(device, CLIFF_ENABLE_SND_1, data & 1);
discrete_sound_w(device, CLIFF_ENABLE_SND_2, (data >> 1) & 1);
// bit 4 (data & 0x10) is overlay related?
}
static WRITE8_HANDLER( cliff_ldwire_w )