Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gamate: clang compile fix. (nw)

Browse Source
This commit is contained in:
Curt Coder 2014-12-06 19:07:06 +02:00
parent 1245ccba8c
commit e35ed4c4bf
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mess/drivers/gamate.c
View File

@ -125,11 +125,11 @@ WRITE8_MEMBER( gamate_state::gamate_video_w )
if (video.bitmap.write) { if (video.bitmap.write) {
if (video.x<ARRAY_LENGTH(video.bitmap.data[0][0]) /*&& video.y<ARRAY_LENGTH(video.bitmap.data[0])*/) if (video.x<ARRAY_LENGTH(video.bitmap.data[0][0]) /*&& video.y<ARRAY_LENGTH(video.bitmap.data[0])*/)
video.bitmap.data[video.bitmap.page2][video.y][video.x]=data; video.bitmap.data[video.bitmap.page2][video.y][video.x]=data;
else else
logerror("%.6f %04x video bitmap x %x invalid\n",machine().time().as_double(), m_maincpu->pc(), video.x); logerror("%.6f %04x video bitmap x %x invalid\n",machine().time().as_double(), m_maincpu->pc(), video.x);
} else { } else {
video.bitmap.data[0][video.y][video.x&(ARRAY_LENGTH(video.bitmap.data[0][0])-1)]=data; video.bitmap.data[0][video.y][video.x&(ARRAY_LENGTH(video.bitmap.data[0][0])-1)]=data;
} }
if (video.y_increment) video.y++; if (video.y_increment) video.y++;
else video.x++; else video.x++;
} }
@ -141,13 +141,13 @@ READ8_MEMBER( gamate_state::gamate_video_r )
UINT8 data=0; UINT8 data=0;
if (video.bitmap.write) { if (video.bitmap.write) {
if (video.x<ARRAY_LENGTH(video.bitmap.data[0][0]) /*&& video.y<ARRAY_LENGTH(video.bitmap.data[0])*/) if (video.x<ARRAY_LENGTH(video.bitmap.data[0][0]) /*&& video.y<ARRAY_LENGTH(video.bitmap.data[0])*/)
data=video.bitmap.data[video.bitmap.page2][video.y][video.x]; data=video.bitmap.data[video.bitmap.page2][video.y][video.x];
else else
logerror("%.6f video bitmap x %x invalid\n",machine().time().as_double(),video.x); logerror("%.6f video bitmap x %x invalid\n",machine().time().as_double(),video.x);
} else { } else {
data=video.bitmap.data[0][video.y][video.x&(ARRAY_LENGTH(video.bitmap.data[0][0])-1)]; data=video.bitmap.data[0][video.y][video.x&(ARRAY_LENGTH(video.bitmap.data[0][0])-1)];
} }
if (m_maincpu->pc()<0xf000) if (m_maincpu->pc()<0xf000)
logerror("%.6f video read %04x %02x\n",machine().time().as_double(),offset, data); logerror("%.6f video read %04x %02x\n",machine().time().as_double(),offset, data);
return data; return data;
} }
@ -196,6 +196,7 @@ static INPUT_PORTS_START( gamate )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SELECT) PORT_NAME("select") PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SELECT) PORT_NAME("select")
INPUT_PORTS_END INPUT_PORTS_END
#ifdef UNUSED_CODE
static const struct gfx_layout gamate_charlayout = static const struct gfx_layout gamate_charlayout =
{ {
4, /* width of object */ 4, /* width of object */
@ -215,6 +216,11 @@ static const unsigned short gamate_palette[4] =
0,1,2,3 0,1,2,3
}; };
static GFXDECODE_START( gamate_charlayout )
GFXDECODE_ENTRY( "gfx1", 0x0000, gamate_charlayout, 0, 0x100 )
GFXDECODE_END
#endif
/* palette in red, green, blue tribles */ /* palette in red, green, blue tribles */
static const unsigned char gamate_colors[4][3] = static const unsigned char gamate_colors[4][3] =
{ {
@ -224,10 +230,6 @@ static const unsigned char gamate_colors[4][3] =
{ 0, 0, 0 } { 0, 0, 0 }
}; };
static GFXDECODE_START( gamate_charlayout )
GFXDECODE_ENTRY( "gfx1", 0x0000, gamate_charlayout, 0, 0x100 )
GFXDECODE_END
PALETTE_INIT_MEMBER(gamate_state, gamate) PALETTE_INIT_MEMBER(gamate_state, gamate)
{ {
int i; int i;