summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/video/vc4000.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/video/vc4000.cpp')
-rw-r--r--src/mame/video/vc4000.cpp27
1 files changed, 11 insertions, 16 deletions
diff --git a/src/mame/video/vc4000.cpp b/src/mame/video/vc4000.cpp
index 5d4c1325266..fa52c41fd20 100644
--- a/src/mame/video/vc4000.cpp
+++ b/src/mame/video/vc4000.cpp
@@ -382,27 +382,23 @@ static const char led[20][12+1] =
void vc4000_state::vc4000_draw_digit(bitmap_ind16 &bitmap, int x, int y, int d, int line)
{
- static const int digit_to_segment[0x10]={
- 0x0fff, 0x007c, 0x17df, 0x15ff, 0x1c7d, 0x1df7, 0x1ff7, 0x007f, 0x1fff, 0x1dff
- };
+ static const int digit_to_segment[0x10]={ 0x0fff, 0x007c, 0x17df, 0x15ff, 0x1c7d, 0x1df7, 0x1ff7, 0x007f, 0x1fff, 0x1dff };
- int i=line,j;
+ int i=line;
- for (j=0; j<sizeof(led[0])-1; j++)
+ for (int j=0; j<sizeof(led[0])-1; j++)
{
if (led[i][j] != ' ' && digit_to_segment[d]&(1<<(led[i][j]-'a')) )
- bitmap.pix16(y+i, x+j) = ((m_video.reg.d.background>>4)&7)^7;
+ bitmap.pix(y+i, x+j) = ((m_video.reg.d.background>>4)&7)^7;
}
}
inline void vc4000_state::vc4000_collision_plot(uint8_t *collision, uint8_t data, uint8_t color, int scale)
{
- int i,j,m;
-
- for (j=0,m=0x80; j<8; j++, m>>=1)
+ for (int j=0, m=0x80; j<8; j++, m>>=1)
{
if (data&m)
- for (i=0; i<scale; i++, collision++) *collision|=color;
+ for (int i=0; i<scale; i++, collision++) *collision|=color;
else
collision+=scale;
}
@@ -576,7 +572,6 @@ inline void vc4000_state::vc4000_draw_grid(uint8_t *collision)
INTERRUPT_GEN_MEMBER(vc4000_state::vc4000_video_line)
{
- int x,y,i;
uint8_t collision[400]={0}; // better alloca or gcc feature of non constant long automatic arrays
const rectangle &visarea = m_screen->visible_area();
assert(ARRAY_LENGTH(collision) >= m_screen->width());
@@ -604,7 +599,7 @@ INTERRUPT_GEN_MEMBER(vc4000_state::vc4000_video_line)
vc4000_draw_grid(collision);
/* init object colours */
- for (i=visarea.min_x; i<visarea.max_x; i++) m_objects[i]=8;
+ for (int i=visarea.min_x; i<visarea.max_x; i++) m_objects[i]=8;
/* calculate object colours and OR overlapping object colours */
vc4000_sprite_update(*m_bitmap, collision, &m_video.sprites[0]);
@@ -612,20 +607,20 @@ INTERRUPT_GEN_MEMBER(vc4000_state::vc4000_video_line)
vc4000_sprite_update(*m_bitmap, collision, &m_video.sprites[2]);
vc4000_sprite_update(*m_bitmap, collision, &m_video.sprites[3]);
- for (i=visarea.min_x; i<visarea.max_x; i++)
+ for (int i=visarea.min_x; i<visarea.max_x; i++)
{
m_video.sprite_collision|=m_sprite_collision[collision[i]];
m_video.background_collision|=m_background_collision[collision[i]];
/* display final object colours */
if (m_objects[i] < 8)
- m_bitmap->pix16(m_video.line, i) = m_objects[i];
+ m_bitmap->pix(m_video.line, i) = m_objects[i];
}
- y = m_video.reg.d.score_control&1?200:20;
+ int y = m_video.reg.d.score_control&1?200:20;
if ((m_video.line>=y)&&(m_video.line<y+20))
{
- x = 60;
+ int x = 60;
vc4000_draw_digit(*m_bitmap, x, y, m_video.reg.d.bcd[0]>>4, m_video.line-y);
vc4000_draw_digit(*m_bitmap, x+16, y, m_video.reg.d.bcd[0]&0xf, m_video.line-y);
if (m_video.reg.d.score_control&2) x -= 16;