summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/video/pk8000.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/video/pk8000.cpp')
-rw-r--r--src/mame/video/pk8000.cpp31
1 files changed, 15 insertions, 16 deletions
diff --git a/src/mame/video/pk8000.cpp b/src/mame/video/pk8000.cpp
index e47b81066fe..9f5f3ccc5c5 100644
--- a/src/mame/video/pk8000.cpp
+++ b/src/mame/video/pk8000.cpp
@@ -104,7 +104,6 @@ void pk8000_base_state::_84_portc_w(uint8_t data)
uint32_t pk8000_base_state::video_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t *videomem)
{
- int x,y,j,b;
uint16_t offset = (m_video_mode & 0xc0) << 8;
rectangle my_rect;
my_rect.set(0, 256+32-1, 0, 192+32-1);
@@ -116,36 +115,36 @@ uint32_t pk8000_base_state::video_update(screen_device &screen, bitmap_ind16 &bi
// Text mode
if (BIT(m_video_mode,5)==0){
// 32 columns
- for (y = 0; y < 24; y++)
+ for (int y = 0; y < 24; y++)
{
- for (x = 0; x < 32; x++)
+ for (int x = 0; x < 32; x++)
{
uint8_t chr = videomem[x +(y*32) + ((m_text_start & 0x0f) << 10)+offset] ;
uint8_t color= m_color[chr>>3];
- for (j = 0; j < 8; j++) {
+ for (int j = 0; j < 8; j++) {
uint8_t code = videomem[((chr<<3) + j) + ((m_chargen_start & 0x0e) << 10)+offset];
- for (b = 0; b < 8; b++)
+ for (int b = 0; b < 8; b++)
{
uint8_t col = (code >> b) & 0x01 ? (color & 0x0f) : ((color>>4) & 0x0f);
- bitmap.pix16((y*8)+j+16, x*8+(7-b)+16) = col;
+ bitmap.pix((y*8)+j+16, x*8+(7-b)+16) = col;
}
}
}
}
} else {
// 40 columns
- for (y = 0; y < 24; y++)
+ for (int y = 0; y < 24; y++)
{
- for (x = 0; x < 42; x++)
+ for (int x = 0; x < 42; x++)
{
uint8_t chr = videomem[x +(y*64) + ((m_text_start & 0x0e) << 10)+offset] ;
- for (j = 0; j < 8; j++) {
+ for (int j = 0; j < 8; j++) {
uint8_t code = videomem[((chr<<3) + j) + ((m_chargen_start & 0x0e) << 10)+offset];
- for (b = 2; b < 8; b++)
+ for (int b = 2; b < 8; b++)
{
uint8_t col = ((code >> b) & 0x01) ? (m_video_color) & 0x0f : (m_video_color>>4) & 0x0f;
- bitmap.pix16((y*8)+j+16, x*6+(7-b)+16+8) = col;
+ bitmap.pix((y*8)+j+16, x*6+(7-b)+16+8) = col;
}
}
}
@@ -153,21 +152,21 @@ uint32_t pk8000_base_state::video_update(screen_device &screen, bitmap_ind16 &bi
}
} else {
//Graphics
- for (y = 0; y < 24; y++)
+ for (int y = 0; y < 24; y++)
{
uint16_t off_color = (((~m_color_start) & 0x08) << 10)+offset + ((y>>3)<<11);
uint16_t off_code = (((~m_video_start) & 0x08) << 10)+offset + ((y>>3)<<11);
- for (x = 0; x < 32; x++)
+ for (int x = 0; x < 32; x++)
{
uint8_t chr = videomem[x +(y*32) + ((m_chargen_start & 0x0e) << 10)+offset] ;
- for (j = 0; j < 8; j++) {
+ for (int j = 0; j < 8; j++) {
uint8_t color= videomem[((chr<<3) + j)+off_color];
uint8_t code = videomem[((chr<<3) + j)+off_code];
- for (b = 0; b < 8; b++)
+ for (int b = 0; b < 8; b++)
{
uint8_t col = (code >> b) & 0x01 ? (color & 0x0f) : ((color>>4) & 0x0f);
- bitmap.pix16((y*8)+j+16, x*8+(7-b)+16) = col;
+ bitmap.pix((y*8)+j+16, x*8+(7-b)+16) = col;
}
}
}