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

(MESS) Reverted accidental odyssey2 palette change. Shuffled some code around (nw)

Browse Source
This commit is contained in:
Wilbert Pol 2013-01-11 21:30:18 +00:00
parent 017e26d568
commit aec743cb17
3 changed files with 47 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/emu/video/i8244.c
View File

@ -16,7 +16,8 @@ const device_type I8244 = &device_creator<i8244_device>;
const device_type I8245 = &device_creator<i8245_device>;
static const UINT8 c_shape[0x40 * 8]={
static const UINT8 c_shape[0x40 * 8] =
{
0x7C,0xC6,0xC6,0xC6,0xC6,0xC6,0x7C,0x00, // 0
0x18,0x38,0x18,0x18,0x18,0x18,0x3C,0x00,
0x3C,0x66,0x0C,0x18,0x30,0x60,0x7E,0x00,

29
src/mess/drivers/odyssey2.c
View File

@ -137,6 +137,35 @@ WRITE_LINE_MEMBER(odyssey2_state::irq_callback)
}
WRITE8_MEMBER(odyssey2_state::lum_write)
{
m_lum = ( data & 0x01 ) << 3;
}
WRITE16_MEMBER(odyssey2_state::scanline_postprocess)
{
int vpos = data;
bitmap_ind16 *bitmap = m_i8244->get_bitmap();
// apply external LUM setting
for ( int x = i8244_device::START_ACTIVE_SCAN; x < i8244_device::END_ACTIVE_SCAN; x++ )
{
bitmap->pix16( vpos, x ) |= ( m_lum ^ 0x08 );
}
}
READ8_MEMBER(odyssey2_state::t1_read_g7400)
{
if ( m_i8244->vblank() || m_i8244->hblank() )
{
return 1;
}
return 0;
}
static const gfx_layout odyssey2_graphicslayout =
{
8,1,

61
src/mess/video/odyssey2.c
View File

@ -34,24 +34,24 @@
const UINT8 odyssey2_colors[] =
{
/* Background,Grid Dim */
0x00, 0x00, 0x00, // 0x00,0x00,0x00, // i r g b
0x00, 0x00, 0xAA, // 0x00,0x00,0xFF, /* Blue */ // i r g B
0x00, 0xAA, 0x00, // 0x00,0x80,0x00, /* DK Green */ // i r G b
0x00, 0xAA, 0xAA, // 0xff,0x9b,0x60, // i r G B
0xAA, 0x00, 0x00, // 0xCC,0x00,0x00, /* Red */ // i R g b
0xAA, 0x00, 0xAA, // 0xa9,0x80,0xff, // i R g B
0xAA, 0xAA, 0x00, // 0x82,0xfd,0xdb, // i R G b
0xAA, 0xAA, 0xAA, // 0xFF,0xFF,0xFF, // i R G B
0x00,0x00,0x00, // i r g b
0x00,0x00,0xFF, /* Blue */ // i r g B
0x00,0x80,0x00, /* DK Green */ // i r G b
0xff,0x9b,0x60, // i r G B
0xCC,0x00,0x00, /* Red */ // i R g b
0xa9,0x80,0xff, // i R g B
0x82,0xfd,0xdb, // i R G b
0xFF,0xFF,0xFF, // i R G B
/* Background,Grid Bright */
0x55, 0x55, 0x55, // 0x80,0x80,0x80, // I r g b
0x55, 0x55, 0xFF, // 0x50,0xAE,0xFF, /* Blue */ // I r g B
0x55, 0xFF, 0x55, // 0x00,0xFF,0x00, /* Dk Green */ // I r G b
0x55, 0xFF, 0xFF, // 0x82,0xfb,0xdb, /* Lt Grey */ // I r G B
0xFF, 0x55, 0x55, // 0xEC,0x02,0x60, /* Red */ // I R g b
0xFF, 0x55, 0xFF, // 0xa9,0x80,0xff, /* Violet */ // I R g B
0xFF, 0xFF, 0x55, // 0xff,0x9b,0x60, /* Orange */ // I R G b
0xFF, 0xFF, 0xFF, // 0xFF,0xFF,0xFF, // I R G B
0x80,0x80,0x80, // I r g b
0x50,0xAE,0xFF, /* Blue */ // I r g B
0x00,0xFF,0x00, /* Dk Green */ // I r G b
0x82,0xfb,0xdb, /* Lt Grey */ // I r G B
0xEC,0x02,0x60, /* Red */ // I R g b
0xa9,0x80,0xff, /* Violet */ // I R g B
0xff,0x9b,0x60, /* Orange */ // I R G b
0xFF,0xFF,0xFF, // I R G B
/* Character,Sprite colors */
0x80,0x80,0x80, /* Dark Grey */ // I r g b
@ -241,25 +241,6 @@ WRITE8_MEMBER(odyssey2_state::video_write)
}
WRITE8_MEMBER(odyssey2_state::lum_write)
{
m_lum = ( data & 0x01 ) << 3;
}
WRITE16_MEMBER(odyssey2_state::scanline_postprocess)
{
int vpos = data;
bitmap_ind16 *bitmap = m_i8244->get_bitmap();
// apply external LUM setting
for ( int x = i8244_device::START_ACTIVE_SCAN; x < i8244_device::END_ACTIVE_SCAN; x++ )
{
bitmap->pix16( vpos, x ) |= ( m_lum ^ 0x08 );
}
}
READ8_MEMBER(odyssey2_state::t1_read)
{
if ( m_screen->vpos() > m_start_vpos && m_screen->vpos() < m_start_vblank )
@ -273,16 +254,6 @@ READ8_MEMBER(odyssey2_state::t1_read)
}
READ8_MEMBER(odyssey2_state::t1_read_g7400)
{
if ( m_i8244->vblank() || m_i8244->hblank() )
{
return 1;
}
return 0;
}
void odyssey2_state::i824x_scanline(int vpos)
{
UINT8 collision_map[160];