diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2016-10-22 18:06:01 +0200 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2016-10-22 18:06:01 +0200 |
commit | d01dd9360f0120b83050d31765e334bd170afd11 (patch) | |
tree | 3c31ac660ffab5da3832d9e9e8bf116a45379f36 /src/mame/video | |
parent | 1446bd7ecddab41b0a0bdf2e933cfc0fd52e3bdd (diff) |
cleanup of TRUE/FALSE in mame section (nw)
Diffstat (limited to 'src/mame/video')
45 files changed, 194 insertions, 194 deletions
diff --git a/src/mame/video/amiga.cpp b/src/mame/video/amiga.cpp index 153915e9a58..0f7b6b9a192 100644 --- a/src/mame/video/amiga.cpp +++ b/src/mame/video/amiga.cpp @@ -192,7 +192,7 @@ void amiga_copper_setpc(running_machine &machine, uint32_t pc) state->logerror("copper_setpc(%06x)\n", pc); state->m_copper_pc = pc; - state->m_copper_waiting = FALSE; + state->m_copper_waiting = false; } @@ -224,7 +224,7 @@ int amiga_copper_execute_next(running_machine &machine, int xpos) if ((curpos & state->m_copper_waitmask) >= (state->m_copper_waitval & state->m_copper_waitmask) && (!state->m_copper_waitblit || !(CUSTOM_REG(REG_DMACON) & DMACON_BBUSY))) { - state->m_copper_waiting = FALSE; + state->m_copper_waiting = false; #if GUESS_COPPER_OFFSET return xpos + COPPER_CYCLES_TO_PIXELS(1 + state->m_wait_offset); #else @@ -284,8 +284,8 @@ int amiga_copper_execute_next(running_machine &machine, int xpos) state->m_copper_waitval = 0xffff; state->m_copper_waitmask = 0xffff; - state->m_copper_waitblit = FALSE; - state->m_copper_waiting = TRUE; + state->m_copper_waitblit = false; + state->m_copper_waiting = true; return 511; } @@ -309,7 +309,7 @@ int amiga_copper_execute_next(running_machine &machine, int xpos) if (LOG_COPPER) state->logerror(" Waiting for %04x & %04x (currently %04x)\n", state->m_copper_waitval, state->m_copper_waitmask, (state->m_last_scanline << 8) | (xpos >> 1)); - state->m_copper_waiting = TRUE; + state->m_copper_waiting = true; } /* handle a skip */ diff --git a/src/mame/video/arcadia.cpp b/src/mame/video/arcadia.cpp index 05bd523d840..36e3c5cd6b3 100644 --- a/src/mame/video/arcadia.cpp +++ b/src/mame/video/arcadia.cpp @@ -477,7 +477,7 @@ void arcadia_state::draw_char(uint8_t *ch, int charcode, int y, int x) void arcadia_state::vh_draw_line(int y, uint8_t chars1[16]) { int x, ch, j, h; - int graphics = m_graphics; + bool graphics = m_graphics; h = m_doublescan ? 16 : 8 ; if (m_bitmap->height() - m_line < h) @@ -495,8 +495,8 @@ void arcadia_state::vh_draw_line(int y, uint8_t chars1[16]) { switch (ch) { - case 0xc0: graphics=TRUE;break; - case 0x40: graphics=FALSE;break; + case 0xc0: graphics=true;break; + case 0x40: graphics=false;break; // case 0x80: // alien invaders shields are empty 0x80 // popmessage(5, "graphics code 0x80 used"); @@ -514,9 +514,9 @@ int arcadia_state::sprite_collision(int n1, int n2) { int k, b1, b2, x; if (m_pos[n1].x+8<=m_pos[n2].x) - return FALSE; + return false; if (m_pos[n1].x>=m_pos[n2].x+8) - return FALSE; + return false; for (k=0; k<8; k++) { @@ -532,9 +532,9 @@ int arcadia_state::sprite_collision(int n1, int n2) if (x>0) b1>>=x; if (b1&b2) - return TRUE; + return true; } - return FALSE; + return false; } @@ -547,7 +547,7 @@ void arcadia_state::draw_sprites() m_reg.d.collision_sprite|=0x3f; for (i=0; i<4; i++) { - int doublescan = FALSE; + int doublescan = false; if (m_pos[i].y<=-YPOS) continue; if (m_pos[i].y>=m_bitmap->height()-YPOS-8) continue; if (m_pos[i].x<=-XPOS) continue; @@ -557,19 +557,19 @@ void arcadia_state::draw_sprites() { case 0: color=(m_reg.d.pal[3]>>3)&7; - doublescan=m_reg.d.pal[3]&0x80?FALSE:TRUE; + doublescan=m_reg.d.pal[3]&0x80?false:true; break; case 1: color=m_reg.d.pal[3]&7; - doublescan=m_reg.d.pal[3]&0x40?FALSE:TRUE; + doublescan=m_reg.d.pal[3]&0x40?false:true; break; case 2: color=(m_reg.d.pal[2]>>3)&7; - doublescan=m_reg.d.pal[2]&0x80?FALSE:TRUE; + doublescan=m_reg.d.pal[2]&0x80?false:true; break; case 3: color=m_reg.d.pal[2]&7; - doublescan=m_reg.d.pal[2]&0x40?FALSE:TRUE; + doublescan=m_reg.d.pal[2]&0x40?false:true; break; } for (k=0; k<8; k++) diff --git a/src/mame/video/astrocde.cpp b/src/mame/video/astrocde.cpp index 467fe56e62a..1efd9c9f14d 100644 --- a/src/mame/video/astrocde.cpp +++ b/src/mame/video/astrocde.cpp @@ -384,7 +384,7 @@ void astrocde_state::device_timer(emu_timer &timer, device_timer_id id, int para scanline_callback(ptr, param); break; default: - assert_always(FALSE, "Unknown id in astrocde_state::device_timer"); + assert_always(false, "Unknown id in astrocde_state::device_timer"); } } diff --git a/src/mame/video/btime.cpp b/src/mame/video/btime.cpp index 30711ffe8c7..f0341bb9c6a 100644 --- a/src/mame/video/btime.cpp +++ b/src/mame/video/btime.cpp @@ -417,10 +417,10 @@ uint32_t btime_state::screen_update_btime(screen_device &screen, bitmap_ind16 &b } draw_background(bitmap, cliprect, m_btime_tilemap, 0); - draw_chars(bitmap, cliprect, TRUE, 0, -1); + draw_chars(bitmap, cliprect, true, 0, -1); } else - draw_chars(bitmap, cliprect, FALSE, 0, -1); + draw_chars(bitmap, cliprect, false, 0, -1); draw_sprites(bitmap, cliprect, 0, 1, 0, m_videoram, 0x20); @@ -430,7 +430,7 @@ uint32_t btime_state::screen_update_btime(screen_device &screen, bitmap_ind16 &b uint32_t btime_state::screen_update_eggs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - draw_chars(bitmap, cliprect, FALSE, 0, -1); + draw_chars(bitmap, cliprect, false, 0, -1); draw_sprites(bitmap, cliprect, 0, 0, 0, m_videoram, 0x20); return 0; @@ -439,7 +439,7 @@ uint32_t btime_state::screen_update_eggs(screen_device &screen, bitmap_ind16 &bi uint32_t btime_state::screen_update_lnc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - draw_chars(bitmap, cliprect, FALSE, 0, -1); + draw_chars(bitmap, cliprect, false, 0, -1); draw_sprites(bitmap, cliprect, 0, 1, 2, m_videoram, 0x20); return 0; @@ -451,10 +451,10 @@ uint32_t btime_state::screen_update_zoar(screen_device &screen, bitmap_ind16 &bi if (m_bnj_scroll1 & 0x04) { draw_background(bitmap, cliprect, m_zoar_scrollram, m_btime_palette); - draw_chars(bitmap, cliprect, TRUE, m_btime_palette + 1, -1); + draw_chars(bitmap, cliprect, true, m_btime_palette + 1, -1); } else - draw_chars(bitmap, cliprect, FALSE, m_btime_palette + 1, -1); + draw_chars(bitmap, cliprect, false, m_btime_palette + 1, -1); /* The order is important for correct priorities */ draw_sprites(bitmap, cliprect, m_btime_palette + 1, 1, 2, m_videoram + 0x1f, 0x20); @@ -499,13 +499,13 @@ uint32_t btime_state::screen_update_bnj(screen_device &screen, bitmap_ind16 &bit /* copy the low priority characters followed by the sprites then the high priority characters */ - draw_chars(bitmap, cliprect, TRUE, 0, 1); + draw_chars(bitmap, cliprect, true, 0, 1); draw_sprites(bitmap, cliprect, 0, 0, 0, m_videoram, 0x20); - draw_chars(bitmap, cliprect, TRUE, 0, 0); + draw_chars(bitmap, cliprect, true, 0, 0); } else { - draw_chars(bitmap, cliprect, FALSE, 0, -1); + draw_chars(bitmap, cliprect, false, 0, -1); draw_sprites(bitmap, cliprect, 0, 0, 0, m_videoram, 0x20); } @@ -537,7 +537,7 @@ uint32_t btime_state::screen_update_cookrace(screen_device &screen, bitmap_ind16 8*sx,8*sy); } - draw_chars(bitmap, cliprect, TRUE, 0, -1); + draw_chars(bitmap, cliprect, true, 0, -1); draw_sprites(bitmap, cliprect, 0, 1, 0, m_videoram, 0x20); return 0; @@ -546,7 +546,7 @@ uint32_t btime_state::screen_update_cookrace(screen_device &screen, bitmap_ind16 uint32_t btime_state::screen_update_disco(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - draw_chars(bitmap, cliprect, FALSE, m_btime_palette, -1); + draw_chars(bitmap, cliprect, false, m_btime_palette, -1); draw_sprites(bitmap, cliprect, m_btime_palette, 0, 0, m_spriteram, 1); return 0; diff --git a/src/mame/video/cchasm.cpp b/src/mame/video/cchasm.cpp index b7b1e3394e2..e97437241ef 100644 --- a/src/mame/video/cchasm.cpp +++ b/src/mame/video/cchasm.cpp @@ -27,7 +27,7 @@ void cchasm_state::device_timer(emu_timer &timer, device_timer_id id, int param, m_maincpu->set_input_line(2, ASSERT_LINE); break; default: - assert_always(FALSE, "Unknown id in cchasm_state::device_timer"); + assert_always(false, "Unknown id in cchasm_state::device_timer"); } } diff --git a/src/mame/video/cischeat.cpp b/src/mame/video/cischeat.cpp index c73e906811d..6042562e7d5 100644 --- a/src/mame/video/cischeat.cpp +++ b/src/mame/video/cischeat.cpp @@ -887,8 +887,8 @@ uint32_t cischeat_state::screen_update_bigrun(screen_device &screen, bitmap_ind1 for (i = 7; i >= 4; i--) { /* bitmap, road, min_priority, max_priority, transparency */ - if (active_layers1 & 0x10) cischeat_draw_road(bitmap,cliprect,0,i,i,FALSE); - if (active_layers1 & 0x20) cischeat_draw_road(bitmap,cliprect,1,i,i,TRUE); + if (active_layers1 & 0x10) cischeat_draw_road(bitmap,cliprect,0,i,i,false); + if (active_layers1 & 0x20) cischeat_draw_road(bitmap,cliprect,1,i,i,true); } flag = 0; @@ -897,8 +897,8 @@ uint32_t cischeat_state::screen_update_bigrun(screen_device &screen, bitmap_ind1 for (i = 3; i >= 0; i--) { /* bitmap, road, min_priority, max_priority, transparency */ - if (active_layers1 & 0x10) cischeat_draw_road(bitmap,cliprect,0,i,i,TRUE); - if (active_layers1 & 0x20) cischeat_draw_road(bitmap,cliprect,1,i,i,TRUE); + if (active_layers1 & 0x10) cischeat_draw_road(bitmap,cliprect,0,i,i,true); + if (active_layers1 & 0x20) cischeat_draw_road(bitmap,cliprect,1,i,i,true); } if (active_layers1 & 0x08) bigrun_draw_sprites(bitmap,cliprect,15,0); @@ -932,8 +932,8 @@ uint32_t cischeat_state::screen_update_cischeat(screen_device &screen, bitmap_in bitmap.fill(0, cliprect); /* bitmap, road, priority, transparency */ - if (active_layers1 & 0x10) cischeat_draw_road(bitmap,cliprect,0,7,5,FALSE); - if (active_layers1 & 0x20) cischeat_draw_road(bitmap,cliprect,1,7,5,TRUE); + if (active_layers1 & 0x10) cischeat_draw_road(bitmap,cliprect,0,7,5,false); + if (active_layers1 & 0x20) cischeat_draw_road(bitmap,cliprect,1,7,5,true); flag = 0; cischeat_tmap_DRAW(0) @@ -941,11 +941,11 @@ uint32_t cischeat_state::screen_update_cischeat(screen_device &screen, bitmap_in cischeat_tmap_DRAW(1) if (active_layers1 & 0x08) cischeat_draw_sprites(bitmap,cliprect,15,3); - if (active_layers1 & 0x10) cischeat_draw_road(bitmap,cliprect,0,4,1,TRUE); - if (active_layers1 & 0x20) cischeat_draw_road(bitmap,cliprect,1,4,1,TRUE); + if (active_layers1 & 0x10) cischeat_draw_road(bitmap,cliprect,0,4,1,true); + if (active_layers1 & 0x20) cischeat_draw_road(bitmap,cliprect,1,4,1,true); if (active_layers1 & 0x08) cischeat_draw_sprites(bitmap,cliprect,2,2); - if (active_layers1 & 0x10) cischeat_draw_road(bitmap,cliprect,0,0,0,TRUE); - if (active_layers1 & 0x20) cischeat_draw_road(bitmap,cliprect,1,0,0,TRUE); + if (active_layers1 & 0x10) cischeat_draw_road(bitmap,cliprect,0,0,0,true); + if (active_layers1 & 0x20) cischeat_draw_road(bitmap,cliprect,1,0,0,true); if (active_layers1 & 0x08) cischeat_draw_sprites(bitmap,cliprect,1,0); cischeat_tmap_DRAW(2) @@ -982,8 +982,8 @@ uint32_t cischeat_state::screen_update_f1gpstar(screen_device &screen, bitmap_in /* 1: clouds 5, grad 7, road 0 2: clouds 5, grad 7, road 0, tunnel roof 0 */ /* road 1!! 0!! */ /* bitmap, road, min_priority, max_priority, transparency */ - if (active_layers1 & 0x20) f1gpstar_draw_road(bitmap,cliprect,1,6,7,TRUE); - if (active_layers1 & 0x10) f1gpstar_draw_road(bitmap,cliprect,0,6,7,TRUE); + if (active_layers1 & 0x20) f1gpstar_draw_road(bitmap,cliprect,1,6,7,true); + if (active_layers1 & 0x10) f1gpstar_draw_road(bitmap,cliprect,0,6,7,true); flag = 0; cischeat_tmap_DRAW(0) @@ -991,14 +991,14 @@ uint32_t cischeat_state::screen_update_f1gpstar(screen_device &screen, bitmap_in cischeat_tmap_DRAW(1) /* road 1!! 0!! */ /* bitmap, road, min_priority, max_priority, transparency */ - if (active_layers1 & 0x20) f1gpstar_draw_road(bitmap,cliprect,1,1,5,TRUE); - if (active_layers1 & 0x10) f1gpstar_draw_road(bitmap,cliprect,0,1,5,TRUE); + if (active_layers1 & 0x20) f1gpstar_draw_road(bitmap,cliprect,1,1,5,true); + if (active_layers1 & 0x10) f1gpstar_draw_road(bitmap,cliprect,0,1,5,true); if (active_layers1 & 0x08) cischeat_draw_sprites(bitmap,cliprect,15,2); /* road 1!! 0!! */ /* bitmap, road, min_priority, max_priority, transparency */ - if (active_layers1 & 0x20) f1gpstar_draw_road(bitmap,cliprect,1,0,0,TRUE); - if (active_layers1 & 0x10) f1gpstar_draw_road(bitmap,cliprect,0,0,0,TRUE); + if (active_layers1 & 0x20) f1gpstar_draw_road(bitmap,cliprect,1,0,0,true); + if (active_layers1 & 0x10) f1gpstar_draw_road(bitmap,cliprect,0,0,0,true); if (active_layers1 & 0x08) cischeat_draw_sprites(bitmap,cliprect,1,1); cischeat_tmap_DRAW(2) diff --git a/src/mame/video/dcheese.cpp b/src/mame/video/dcheese.cpp index 0c21ac95555..37c0fe12b69 100644 --- a/src/mame/video/dcheese.cpp +++ b/src/mame/video/dcheese.cpp @@ -83,7 +83,7 @@ void dcheese_state::device_timer(emu_timer &timer, device_timer_id id, int param dcheese_signal_irq(param); break; default: - assert_always(FALSE, "Unknown id in dcheese_state::device_timer"); + assert_always(false, "Unknown id in dcheese_state::device_timer"); } } diff --git a/src/mame/video/exidy.cpp b/src/mame/video/exidy.cpp index 83ad3f224ae..01a7ee98540 100644 --- a/src/mame/video/exidy.cpp +++ b/src/mame/video/exidy.cpp @@ -270,7 +270,7 @@ void exidy_state::device_timer(emu_timer &timer, device_timer_id id, int param, break; default: - assert_always(FALSE, "Unknown id in exidy_state::device_timer"); + assert_always(false, "Unknown id in exidy_state::device_timer"); } } diff --git a/src/mame/video/exidy440.cpp b/src/mame/video/exidy440.cpp index 10dd35f4381..0a5e8580699 100644 --- a/src/mame/video/exidy440.cpp +++ b/src/mame/video/exidy440.cpp @@ -410,7 +410,7 @@ void exidy440_state::update_screen(screen_device &screen, bitmap_ind16 &bitmap, uint32_t exidy440_state::screen_update_exidy440(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { /* redraw the screen */ - update_screen(screen, bitmap, cliprect, 0, TRUE); + update_screen(screen, bitmap, cliprect, 0, true); /* generate an interrupt once/frame for the beam */ if (cliprect.max_y == screen.visible_area().max_y) @@ -442,7 +442,7 @@ uint32_t exidy440_state::screen_update_exidy440(screen_device &screen, bitmap_in uint32_t exidy440_state::screen_update_topsecex(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { /* redraw the screen */ - update_screen(screen, bitmap, cliprect, m_topsecex_yscroll, FALSE); + update_screen(screen, bitmap, cliprect, m_topsecex_yscroll, false); return 0; } diff --git a/src/mame/video/firetrk.cpp b/src/mame/video/firetrk.cpp index 080e574515c..492c904852d 100644 --- a/src/mame/video/firetrk.cpp +++ b/src/mame/video/firetrk.cpp @@ -358,14 +358,14 @@ uint32_t firetrk_state::screen_update_firetrk(screen_device &screen, bitmap_ind1 m_tilemap2->draw(screen, m_helper1, playfield_window, 0, 0); m_helper2.fill(0xff, playfield_window); - firetrk_draw_car(m_helper2, playfield_window, 0, FALSE); + firetrk_draw_car(m_helper2, playfield_window, 0, false); check_collision(0); m_helper2.fill(0xff, playfield_window); - firetrk_draw_car(m_helper2, playfield_window, 1, FALSE); + firetrk_draw_car(m_helper2, playfield_window, 1, false); check_collision(1); - *m_blink = FALSE; + *m_blink = false; } return 0; @@ -391,10 +391,10 @@ uint32_t firetrk_state::screen_update_superbug(screen_device &screen, bitmap_ind m_tilemap2->draw(screen, m_helper1, playfield_window, 0, 0); m_helper2.fill(0xff, playfield_window); - superbug_draw_car(m_helper2, playfield_window, FALSE); + superbug_draw_car(m_helper2, playfield_window, false); check_collision(0); - *m_blink = FALSE; + *m_blink = false; } return 0; @@ -411,8 +411,8 @@ uint32_t firetrk_state::screen_update_montecar(screen_device &screen, bitmap_ind bitmap.fill(0x2c, cliprect); m_tilemap1->draw(screen, bitmap, playfield_window, 0, 0); - montecar_draw_car(bitmap, playfield_window, 0, FALSE); - montecar_draw_car(bitmap, playfield_window, 1, FALSE); + montecar_draw_car(bitmap, playfield_window, 0, false); + montecar_draw_car(bitmap, playfield_window, 1, false); draw_text(bitmap, cliprect, m_alpha_num_ram + 0x00, 24, 0x20, 0x08); draw_text(bitmap, cliprect, m_alpha_num_ram + 0x20, 16, 0x20, 0x08); @@ -421,11 +421,11 @@ uint32_t firetrk_state::screen_update_montecar(screen_device &screen, bitmap_ind m_tilemap2->draw(screen, m_helper1, playfield_window, 0, 0); m_helper2.fill(0xff, playfield_window); - montecar_draw_car(m_helper2, playfield_window, 0, TRUE); + montecar_draw_car(m_helper2, playfield_window, 0, true); check_collision(0); m_helper2.fill(0xff, playfield_window); - montecar_draw_car(m_helper2, playfield_window, 1, TRUE); + montecar_draw_car(m_helper2, playfield_window, 1, true); check_collision(1); } diff --git a/src/mame/video/gaelco3d.cpp b/src/mame/video/gaelco3d.cpp index 38f88d1ca64..e8721eee36c 100644 --- a/src/mame/video/gaelco3d.cpp +++ b/src/mame/video/gaelco3d.cpp @@ -385,7 +385,7 @@ WRITE32_MEMBER(gaelco3d_state::gaelco3d_render_w) m_poly->render_poly(*m_screen, &m_polydata_buffer[0]); m_polydata_count = 0; } - m_video_changed = TRUE; + m_video_changed = true; } #if DISPLAY_STATS @@ -471,7 +471,7 @@ uint32_t gaelco3d_state::screen_update_gaelco3d(screen_device &screen, bitmap_in if (m_video_changed) copybitmap(bitmap, m_poly->screenbits(), 0,1, 0,0, cliprect); ret = m_video_changed; - m_video_changed = FALSE; + m_video_changed = false; } logerror("---update---\n"); diff --git a/src/mame/video/galaxian.cpp b/src/mame/video/galaxian.cpp index e2e53d9a0cb..12fa18015c3 100644 --- a/src/mame/video/galaxian.cpp +++ b/src/mame/video/galaxian.cpp @@ -782,7 +782,7 @@ void galaxian_state::stars_init() int i; /* reset the blink and enabled states */ - m_stars_enabled = FALSE; + m_stars_enabled = false; m_stars_blink_state = 0; /* precalculate the RNG */ diff --git a/src/mame/video/galaxy.cpp b/src/mame/video/galaxy.cpp index 7e67fbd29c4..f4eeef8a916 100644 --- a/src/mame/video/galaxy.cpp +++ b/src/mame/video/galaxy.cpp @@ -19,7 +19,7 @@ TIMER_CALLBACK_MEMBER(galaxy_state::gal_video) { address_space &space = m_maincpu->space(AS_PROGRAM); int y, x; - if (m_interrupts_enabled == TRUE) + if (m_interrupts_enabled == true) { uint8_t *gfx = m_region_gfx1->base(); uint8_t dat = (m_latch_value & 0x3c) >> 2; @@ -123,12 +123,12 @@ void galaxy_state::video_start() uint32_t galaxy_state::screen_update_galaxy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { m_gal_video_timer->adjust(attotime::zero, 0, attotime::never); - if (m_interrupts_enabled == FALSE) + if (m_interrupts_enabled == false) { const rectangle black_area(0, 384 - 1, 0, 208 - 1); m_bitmap.fill(0, black_area); } - m_interrupts_enabled = FALSE; + m_interrupts_enabled = false; copybitmap(bitmap, m_bitmap, 0, 0, 0, 0, cliprect); return 0; } diff --git a/src/mame/video/gameplan.cpp b/src/mame/video/gameplan.cpp index d47a82923ed..8d70e38120c 100644 --- a/src/mame/video/gameplan.cpp +++ b/src/mame/video/gameplan.cpp @@ -51,7 +51,7 @@ void gameplan_state::device_timer(emu_timer &timer, device_timer_id id, int para via_0_ca1_timer_callback(ptr, param); break; default: - assert_always(FALSE, "Unknown id in gameplan_state::device_timer"); + assert_always(false, "Unknown id in gameplan_state::device_timer"); } } diff --git a/src/mame/video/gottlieb.cpp b/src/mame/video/gottlieb.cpp index 1be6bd01568..e7fa9c62acd 100644 --- a/src/mame/video/gottlieb.cpp +++ b/src/mame/video/gottlieb.cpp @@ -69,8 +69,8 @@ WRITE8_MEMBER(gottlieb_state::gottlieb_laserdisc_video_control_w) /* bit 2 video enable (0 = black screen) */ /* bit 3 genlock control (1 = show laserdisc image) */ - m_laserdisc->overlay_enable((data & 0x04) ? TRUE : FALSE); - m_laserdisc->video_enable(((data & 0x0c) == 0x0c) ? TRUE : FALSE); + m_laserdisc->overlay_enable((data & 0x04) ? true : false); + m_laserdisc->video_enable(((data & 0x0c) == 0x0c) ? true : false); /* configure the palette if the laserdisc is enabled */ m_transparent0 = (data >> 3) & 1; @@ -142,7 +142,7 @@ void gottlieb_state::video_start() 4, resistances, m_weights, 180, 0, 4, resistances, m_weights, 180, 0, 4, resistances, m_weights, 180, 0); - m_transparent0 = FALSE; + m_transparent0 = false; /* configure the background tilemap */ m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gottlieb_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -167,7 +167,7 @@ VIDEO_START_MEMBER(gottlieb_state,screwloo) 4, resistances, m_weights, 180, 0, 4, resistances, m_weights, 180, 0, 4, resistances, m_weights, 180, 0); - m_transparent0 = FALSE; + m_transparent0 = false; /* configure the background tilemap */ m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(gottlieb_state::get_screwloo_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/hyhoo.cpp b/src/mame/video/hyhoo.cpp index 7903dfa1f29..ab1baaa04db 100644 --- a/src/mame/video/hyhoo.cpp +++ b/src/mame/video/hyhoo.cpp @@ -61,7 +61,7 @@ void hyhoo_state::device_timer(emu_timer &timer, device_timer_id id, int param, m_nb1413m3->m_busyflag = 1; break; default: - assert_always(FALSE, "Unknown id in hyhoo_state::device_timer"); + assert_always(false, "Unknown id in hyhoo_state::device_timer"); } } diff --git a/src/mame/video/jagobj.hxx b/src/mame/video/jagobj.hxx index 41ad1f8a636..c11ff0f73f0 100644 --- a/src/mame/video/jagobj.hxx +++ b/src/mame/video/jagobj.hxx @@ -559,7 +559,7 @@ static inline uint8_t lookup_pixel(const uint32_t *src, int i, int pitch, int de * *************************************/ -uint32_t *jaguar_state::process_bitmap(uint16_t *scanline, uint32_t *objdata, int vc, int logit) +uint32_t *jaguar_state::process_bitmap(uint16_t *scanline, uint32_t *objdata, int vc, bool logit) { /* extract minimal data */ uint32_t upper = objdata[0]; @@ -737,7 +737,7 @@ uint32_t *jaguar_state::process_bitmap(uint16_t *scanline, uint32_t *objdata, in * *************************************/ -uint32_t *jaguar_state::process_scaled_bitmap(uint16_t *scanline, uint32_t *objdata, int vc, int logit) +uint32_t *jaguar_state::process_scaled_bitmap(uint16_t *scanline, uint32_t *objdata, int vc, bool logit) { /* extract data */ uint32_t upper = objdata[0]; @@ -953,7 +953,7 @@ uint32_t *jaguar_state::process_scaled_bitmap(uint16_t *scanline, uint32_t *objd * *************************************/ -uint32_t *jaguar_state::process_branch(uint32_t *objdata, int vc, int logit) +uint32_t *jaguar_state::process_branch(uint32_t *objdata, int vc, bool logit) { uint32_t upper = objdata[0]; uint32_t lower = objdata[1]; @@ -1019,7 +1019,7 @@ void jaguar_state::process_object_list(int vc, uint16_t *scanline) { int done = 0, count = 0; uint32_t *objdata; - int logit; + bool logit; int x; /* erase the scanline first */ diff --git a/src/mame/video/lethalj.cpp b/src/mame/video/lethalj.cpp index 068569629fc..f6242e519d2 100644 --- a/src/mame/video/lethalj.cpp +++ b/src/mame/video/lethalj.cpp @@ -110,7 +110,7 @@ void lethalj_state::device_timer(emu_timer &timer, device_timer_id id, int param m_maincpu->set_input_line(0, ASSERT_LINE); break; default: - assert_always(FALSE, "Unknown id in lethalj_state::device_timer"); + assert_always(false, "Unknown id in lethalj_state::device_timer"); } } diff --git a/src/mame/video/m92.cpp b/src/mame/video/m92.cpp index 9ddb6f7c334..1329b260427 100644 --- a/src/mame/video/m92.cpp +++ b/src/mame/video/m92.cpp @@ -56,7 +56,7 @@ void m92_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo m92_sprite_interrupt(); break; default: - assert_always(FALSE, "Unknown id in m92_state::device_timer"); + assert_always(false, "Unknown id in m92_state::device_timer"); } } @@ -220,13 +220,13 @@ WRITE16_MEMBER(m92_state::m92_master_control_w) /* update size (bit 2) */ if (m_pf_master_control[offset] & 0x04) { - layer->tmap->enable(FALSE); + layer->tmap->enable(false); layer->wide_tmap->enable((~m_pf_master_control[offset] >> 4) & 1); } else { layer->tmap->enable((~m_pf_master_control[offset] >> 4) & 1); - layer->wide_tmap->enable(FALSE); + layer->wide_tmap->enable(false); } /* mark everything dirty of the VRAM base or size changes */ diff --git a/src/mame/video/micro3d.cpp b/src/mame/video/micro3d.cpp index 13e48322f46..fa15bf259f3 100644 --- a/src/mame/video/micro3d.cpp +++ b/src/mame/video/micro3d.cpp @@ -482,7 +482,7 @@ int micro3d_state::clip_triangle(micro3d_vtx *v, micro3d_vtx *vout, int num_vert void micro3d_state::draw_triangles(uint32_t attr) { int i; - int triangles = 0; + bool triangles = false; int vertices = m_fifo_idx / 3; int min_y = 0x3ff; int max_y = 0; @@ -548,7 +548,7 @@ void micro3d_state::draw_triangles(uint32_t attr) micro3d_vtx a = vclip_list[0]; micro3d_vtx b = vclip_list[1]; - triangles = TRUE; + triangles = true; a.x += m_x_mid; a.y += m_y_mid; @@ -589,7 +589,7 @@ void micro3d_state::draw_triangles(uint32_t attr) } } - if (triangles == TRUE) + if (triangles == true) rasterise_spans(min_y, max_y, attr); } diff --git a/src/mame/video/midtunit.cpp b/src/mame/video/midtunit.cpp index 6105b83be55..075e3c366f1 100644 --- a/src/mame/video/midtunit.cpp +++ b/src/mame/video/midtunit.cpp @@ -589,7 +589,7 @@ void midtunit_state::device_timer(emu_timer &timer, device_timer_id id, int para m_maincpu->set_input_line(0, ASSERT_LINE); break; default: - assert_always(FALSE, "Unknown id in midtunit_state::device_timer"); + assert_always(false, "Unknown id in midtunit_state::device_timer"); } } diff --git a/src/mame/video/midvunit.cpp b/src/mame/video/midvunit.cpp index 19e215939dc..2fb9ef2031d 100644 --- a/src/mame/video/midvunit.cpp +++ b/src/mame/video/midvunit.cpp @@ -47,7 +47,7 @@ void midvunit_state::device_timer(emu_timer &timer, device_timer_id id, int para scanline_timer_cb(ptr, param); break; default: - assert_always(FALSE, "Unknown id in midvunit_state::device_timer"); + assert_always(false, "Unknown id in midvunit_state::device_timer"); } } @@ -77,13 +77,13 @@ void midvunit_state::video_start() save_item(NAME(m_dma_data_index)); save_item(NAME(m_page_control)); - m_video_changed = TRUE; + m_video_changed = true; machine().save().register_postload(save_prepost_delegate(FUNC(midvunit_state::postload), this)); } void midvunit_state::postload() { - m_video_changed = TRUE; + m_video_changed = true; } /************************************* @@ -295,7 +295,7 @@ void midvunit_renderer::process_dma_queue() { /* if we're rendering to the same page we're viewing, it has changed */ if ((((m_state.m_page_control >> 2) ^ m_state.m_page_control) & 1) == 0 || WATCH_RENDER) - m_state.m_video_changed = TRUE; + m_state.m_video_changed = true; /* fill in the vertex data */ vertex_t vert[4]; @@ -420,7 +420,7 @@ WRITE32_MEMBER(midvunit_state::midvunit_page_control_w) /* watch for the display page to change */ if ((m_page_control ^ data) & 1) { - m_video_changed = TRUE; + m_video_changed = true; if (LOG_DMA && machine().input().code_pressed(KEYCODE_L)) logerror("##########################################################\n"); m_screen->update_partial(m_screen->vpos() - 1); @@ -488,7 +488,7 @@ WRITE32_MEMBER(midvunit_state::midvunit_videoram_w) { int visbase = (m_page_control & 1) ? 0x40000 : 0x00000; if ((offset & 0x40000) == visbase) - m_video_changed = TRUE; + m_video_changed = true; } COMBINE_DATA(&m_videoram[offset]); } @@ -559,7 +559,7 @@ uint32_t midvunit_state::screen_update_midvunit(screen_device &screen, bitmap_in /* if the video didn't change, indicate as much */ if (!m_video_changed) return UPDATE_HAS_NOT_CHANGED; - m_video_changed = FALSE; + m_video_changed = false; /* determine the base of the videoram */ #if WATCH_RENDER diff --git a/src/mame/video/midyunit.cpp b/src/mame/video/midyunit.cpp index 32d56ccb96a..57266ea88f7 100644 --- a/src/mame/video/midyunit.cpp +++ b/src/mame/video/midyunit.cpp @@ -369,7 +369,7 @@ void midyunit_state::device_timer(emu_timer &timer, device_timer_id id, int para autoerase_line(ptr, param); break; default: - assert_always(FALSE, "Unknown id in midyunit_state::device_timer"); + assert_always(false, "Unknown id in midyunit_state::device_timer"); } } diff --git a/src/mame/video/midzeus.cpp b/src/mame/video/midzeus.cpp index f73e84fa393..ac2280cd234 100644 --- a/src/mame/video/midzeus.cpp +++ b/src/mame/video/midzeus.cpp @@ -71,7 +71,7 @@ public: void render_poly(int32_t scanline, const extent_t& extent, const mz_poly_extra_data& object, int threadid); void render_poly_solid_fixedz(int32_t scanline, const extent_t& extent, const mz_poly_extra_data& object, int threadid); - void zeus_draw_quad(int long_fmt, const uint32_t *databuffer, uint32_t texdata, int logit); + void zeus_draw_quad(int long_fmt, const uint32_t *databuffer, uint32_t texdata, bool logit); void zeus_draw_debug_quad(const rectangle& rect, const vertex_t* vert); private: @@ -401,7 +401,7 @@ uint32_t midzeus_state::screen_update_midzeus(screen_device &screen, bitmap_ind1 READ32_MEMBER(midzeus_state::zeus_r) { - int logit = (offset < 0xb0 || offset > 0xb7); + bool logit = (offset < 0xb0 || offset > 0xb7); uint32_t result = m_zeusbase[offset & ~1]; switch (offset & ~1) @@ -471,7 +471,7 @@ READ32_MEMBER(midzeus_state::zeus_r) WRITE32_MEMBER(midzeus_state::zeus_w) { - int logit = zeus_enable_logging || ((offset < 0xb0 || offset > 0xb7) && (offset < 0xe0 || offset > 0xe1)); + bool logit = zeus_enable_logging || ((offset < 0xb0 || offset > 0xb7) && (offset < 0xe0 || offset > 0xe1)); if (logit) logerror("%06X:zeus_w", space.device().safe_pc()); @@ -494,7 +494,7 @@ WRITE32_MEMBER(midzeus_state::zeus_w) * *************************************/ -void midzeus_state::zeus_pointer_w(uint32_t which, uint32_t data, int logit) +void midzeus_state::zeus_pointer_w(uint32_t which, uint32_t data, bool logit) { switch (which & 0xffffff) { @@ -562,7 +562,7 @@ void midzeus_state::zeus_pointer_w(uint32_t which, uint32_t data, int logit) * *************************************/ -void midzeus_state::zeus_register16_w(offs_t offset, uint16_t data, int logit) +void midzeus_state::zeus_register16_w(offs_t offset, uint16_t data, bool logit) { /* writes to register $CC need to force a partial update */ if ((offset & ~1) == 0xcc) @@ -586,7 +586,7 @@ void midzeus_state::zeus_register16_w(offs_t offset, uint16_t data, int logit) } -void midzeus_state::zeus_register32_w(offs_t offset, uint32_t data, int logit) +void midzeus_state::zeus_register32_w(offs_t offset, uint32_t data, bool logit) { /* writes to register $CC need to force a partial update */ if ((offset & ~1) == 0xcc) @@ -804,7 +804,7 @@ int midzeus_state::zeus_fifo_process(const uint32_t *data, int numwords) case 0x00: case 0x01: if (numwords < 2 && data[0] != 0) - return FALSE; + return false; if (log_fifo) log_fifo_command(data, numwords, ""); zeus_pointer_w(data[0] & 0xffffff, data[1], log_fifo); @@ -828,7 +828,7 @@ int midzeus_state::zeus_fifo_process(const uint32_t *data, int numwords) /* in model data, this is 0x19 */ case 0x18: if (numwords < 2) - return FALSE; + return false; if (log_fifo) log_fifo_command(data, numwords, " -- reg32"); zeus_register32_w((data[0] >> 16) & 0x7f, data[1], log_fifo); @@ -850,7 +850,7 @@ int midzeus_state::zeus_fifo_process(const uint32_t *data, int numwords) { /* requires 8 words total */ if (numwords < 8) - return FALSE; + return false; if (log_fifo) { log_fifo_command(data, numwords, ""); @@ -882,7 +882,7 @@ int midzeus_state::zeus_fifo_process(const uint32_t *data, int numwords) /* requires 13 words total */ if (numwords < 13) - return FALSE; + return false; if (log_fifo) { log_fifo_command(data, numwords, ""); @@ -931,7 +931,7 @@ int midzeus_state::zeus_fifo_process(const uint32_t *data, int numwords) case 0x23: case 0x2e: if (numwords < 2) - return FALSE; + return false; if (log_fifo) { log_fifo_command(data, numwords, ""); @@ -951,7 +951,7 @@ int midzeus_state::zeus_fifo_process(const uint32_t *data, int numwords) if (is_mk4b) { if (numwords < 2) - return FALSE; + return false; break; } @@ -959,7 +959,7 @@ int midzeus_state::zeus_fifo_process(const uint32_t *data, int numwords) case 0x28: case 0x30: if (numwords < 4 || ((data[0] & 0x808000) && numwords < 10)) - return FALSE; + return false; if (log_fifo) log_fifo_command(data, numwords, " -- alt. quad and hack screen clear\n"); @@ -975,7 +975,7 @@ int midzeus_state::zeus_fifo_process(const uint32_t *data, int numwords) else { uint32_t texdata = (m_zeusbase[0x06] << 16) | (m_zeusbase[0x00] >> 16); - poly->zeus_draw_quad(FALSE, data, texdata, log_fifo); + poly->zeus_draw_quad(false, data, texdata, log_fifo); } break; @@ -990,7 +990,7 @@ int midzeus_state::zeus_fifo_process(const uint32_t *data, int numwords) /* 0x67: render model with inline texture info */ case 0x67: if (numwords < 3) - return FALSE; + return false; if (log_fifo) log_fifo_command(data, numwords, ""); zeus_objdata = data[1]; @@ -1003,7 +1003,7 @@ int midzeus_state::zeus_fifo_process(const uint32_t *data, int numwords) log_fifo_command(data, numwords, "\n"); break; } - return TRUE; + return true; } @@ -1014,11 +1014,11 @@ int midzeus_state::zeus_fifo_process(const uint32_t *data, int numwords) * *************************************/ -void midzeus_state::zeus_draw_model(uint32_t texdata, int logit) +void midzeus_state::zeus_draw_model(uint32_t texdata, bool logit) { uint32_t databuffer[32]; int databufcount = 0; - int model_done = FALSE; + int model_done = false; if (logit) logerror(" -- model @ %08X\n", zeus_objdata); @@ -1063,7 +1063,7 @@ void midzeus_state::zeus_draw_model(uint32_t texdata, int logit) case 0x08: if (logit) logerror("end of model\n"); - model_done = TRUE; + model_done = true; break; case 0x0c: /* mk4/invasn */ @@ -1089,7 +1089,7 @@ void midzeus_state::zeus_draw_model(uint32_t texdata, int logit) case 0x25: /* mk4 */ case 0x28: /* mk4r1 */ case 0x30: /* invasn */ - poly->zeus_draw_quad(TRUE, databuffer, texdata, logit); + poly->zeus_draw_quad(true, databuffer, texdata, logit); break; default: @@ -1113,7 +1113,7 @@ void midzeus_state::zeus_draw_model(uint32_t texdata, int logit) * *************************************/ -void midzeus_renderer::zeus_draw_quad(int long_fmt, const uint32_t *databuffer, uint32_t texdata, int logit) +void midzeus_renderer::zeus_draw_quad(int long_fmt, const uint32_t *databuffer, uint32_t texdata, bool logit) { poly_vertex clipvert[8]; poly_vertex vert[4]; @@ -1535,7 +1535,7 @@ void midzeus_state::log_waveram(uint32_t length_and_base) uint32_t numoctets = (length_and_base >> 24) + 1; const uint32_t *ptr = (const uint32_t *)waveram0_ptr_from_block_addr(length_and_base); uint32_t checksum = length_and_base; - int foundit = FALSE; + int foundit = false; int i; for (i = 0; i < numoctets; i++) @@ -1544,7 +1544,7 @@ void midzeus_state::log_waveram(uint32_t length_and_base) for (i = 0; i < ARRAY_LENGTH(recent_entries); i++) if (recent_entries[i].lab == length_and_base && recent_entries[i].checksum == checksum) { - foundit = TRUE; + foundit = true; break; } diff --git a/src/mame/video/midzeus2.cpp b/src/mame/video/midzeus2.cpp index 5f4d1d9b963..ff7690a6bd6 100644 --- a/src/mame/video/midzeus2.cpp +++ b/src/mame/video/midzeus2.cpp @@ -64,7 +64,7 @@ public: void render_poly_8bit(int32_t scanline, const extent_t& extent, const mz2_poly_extra_data& object, int threadid); - void zeus2_draw_quad(const uint32_t *databuffer, uint32_t texoffs, int logit); + void zeus2_draw_quad(const uint32_t *databuffer, uint32_t texoffs, bool logit); private: midzeus2_state& m_state; @@ -426,7 +426,7 @@ if (machine().input().code_pressed(KEYCODE_DOWN)) { zbase -= 1.0f; popmessage("Z READ32_MEMBER( midzeus2_state::zeus2_r ) { - int logit = (offset != 0x00 && offset != 0x01 && offset != 0x54 && offset != 0x48 && offset != 0x49 && offset != 0x58 && offset != 0x59 && offset != 0x5a); + bool logit = (offset != 0x00 && offset != 0x01 && offset != 0x54 && offset != 0x48 && offset != 0x49 && offset != 0x58 && offset != 0x59 && offset != 0x5a); uint32_t result = m_zeusbase[offset]; #if TRACK_REG_USAGE @@ -475,7 +475,7 @@ READ32_MEMBER( midzeus2_state::zeus2_r ) WRITE32_MEMBER( midzeus2_state::zeus2_w ) { - int logit = (offset != 0x08 && + bool logit = (offset != 0x08 && (offset != 0x20 || data != 0) && offset != 0x40 && offset != 0x41 && offset != 0x48 && offset != 0x49 && offset != 0x4e && offset != 0x50 && offset != 0x51 && offset != 0x57 && offset != 0x58 && offset != 0x59 && offset != 0x5a && offset != 0x5e); @@ -492,7 +492,7 @@ WRITE32_MEMBER( midzeus2_state::zeus2_w ) * *************************************/ -void midzeus2_state::zeus2_register32_w(offs_t offset, uint32_t data, int logit) +void midzeus2_state::zeus2_register32_w(offs_t offset, uint32_t data, bool logit) { uint32_t oldval = m_zeusbase[offset]; @@ -538,7 +538,7 @@ if (regdata_count[offset] < 256) * *************************************/ -void midzeus2_state::zeus2_register_update(offs_t offset, uint32_t oldval, int logit) +void midzeus2_state::zeus2_register_update(offs_t offset, uint32_t oldval, bool logit) { /* handle the writes; only trigger on low accesses */ switch (offset) @@ -792,7 +792,7 @@ if (subregdata_count[which] < 256) * *************************************/ -int midzeus2_state::zeus2_fifo_process(const uint32_t *data, int numwords) +bool midzeus2_state::zeus2_fifo_process(const uint32_t *data, int numwords) { int dataoffs = 0; @@ -802,7 +802,7 @@ int midzeus2_state::zeus2_fifo_process(const uint32_t *data, int numwords) /* 0x05: write 32-bit value to low registers */ case 0x05: if (numwords < 2) - return FALSE; + return false; if (log_fifo) log_fifo_command(data, numwords, " -- reg32"); if (((data[0] >> 16) & 0x7f) != 0x08) @@ -812,13 +812,13 @@ int midzeus2_state::zeus2_fifo_process(const uint32_t *data, int numwords) /* 0x08: set matrix and point (thegrid) */ case 0x08: if (numwords < 14) - return FALSE; + return false; dataoffs = 1; /* 0x07: set matrix and point (crusnexo) */ case 0x07: if (numwords < 13) - return FALSE; + return false; /* extract the matrix from the raw data */ zeus_matrix[0][0] = tms3203x_device::fp_to_float(data[dataoffs + 1]); @@ -854,7 +854,7 @@ int midzeus2_state::zeus2_fifo_process(const uint32_t *data, int numwords) case 0x15: case 0x16: if (numwords < 4) - return FALSE; + return false; /* extract the translation point from the raw data */ zeus_point[0] = tms3203x_device::fp_to_float(data[1]); @@ -874,7 +874,7 @@ int midzeus2_state::zeus2_fifo_process(const uint32_t *data, int numwords) /* 0x1c: */ case 0x1c: if (numwords < 4) - return FALSE; + return false; if (log_fifo) { log_fifo_command(data, numwords, " -- unknown control + hack clear screen\n"); @@ -902,7 +902,7 @@ int midzeus2_state::zeus2_fifo_process(const uint32_t *data, int numwords) case 0x23: case 0x24: if (numwords < 2) - return FALSE; + return false; if (log_fifo) log_fifo_command(data, numwords, ""); zeus2_draw_model(data[1], data[0] & 0xffff, log_fifo); @@ -920,7 +920,7 @@ int midzeus2_state::zeus2_fifo_process(const uint32_t *data, int numwords) /* 0x38: direct render quad (crusnexo) */ case 0x38: if (numwords < 12) - return FALSE; + return false; if (log_fifo) log_fifo_command(data, numwords, ""); break; @@ -940,7 +940,7 @@ int midzeus2_state::zeus2_fifo_process(const uint32_t *data, int numwords) } break; } - return TRUE; + return true; } @@ -951,11 +951,11 @@ int midzeus2_state::zeus2_fifo_process(const uint32_t *data, int numwords) * *************************************/ -void midzeus2_state::zeus2_draw_model(uint32_t baseaddr, uint16_t count, int logit) +void midzeus2_state::zeus2_draw_model(uint32_t baseaddr, uint16_t count, bool logit) { uint32_t databuffer[32]; int databufcount = 0; - int model_done = FALSE; + bool model_done = false; uint32_t texoffs = 0; int quadsize = zeus_quad_size; @@ -1056,7 +1056,7 @@ void midzeus2_state::zeus2_draw_model(uint32_t baseaddr, uint16_t count, int log * *************************************/ -void midzeus2_renderer::zeus2_draw_quad(const uint32_t *databuffer, uint32_t texoffs, int logit) +void midzeus2_renderer::zeus2_draw_quad(const uint32_t *databuffer, uint32_t texoffs, bool logit) { poly_vertex clipvert[8]; poly_vertex vert[4]; diff --git a/src/mame/video/model3.cpp b/src/mame/video/model3.cpp index 07a7a04f8bc..e8ec96fe7e6 100644 --- a/src/mame/video/model3.cpp +++ b/src/mame/video/model3.cpp @@ -1530,7 +1530,7 @@ void model3_state::draw_model(uint32_t addr) uint32_t header[7]; int index = 0; - int last_polygon = FALSE, first_polygon = TRUE, back_face = FALSE; + bool last_polygon = false, first_polygon = true, back_face = false; int num_vertices; int i, v, vi; float fixed_point_fraction; @@ -1575,13 +1575,13 @@ void model3_state::draw_model(uint32_t addr) if (first_polygon && (header[0] & 0x0f) != 0) return; - first_polygon = FALSE; + first_polygon = false; if (header[6] == 0) return; if (header[1] & 0x4) - last_polygon = TRUE; + last_polygon = true; if ((header[0] & 0x300) == 0x300) // TODO: broken polygons in srally2 have these bits set return; diff --git a/src/mame/video/nbmj8688.cpp b/src/mame/video/nbmj8688.cpp index 11b4b41e70e..7e42b075668 100644 --- a/src/mame/video/nbmj8688.cpp +++ b/src/mame/video/nbmj8688.cpp @@ -276,7 +276,7 @@ void nbmj8688_state::device_timer(emu_timer &timer, device_timer_id id, int para m_nb1413m3->m_busyflag = 1; break; default: - assert_always(FALSE, "Unknown id in nbmj8688_state::device_timer"); + assert_always(false, "Unknown id in nbmj8688_state::device_timer"); } } diff --git a/src/mame/video/nbmj8891.cpp b/src/mame/video/nbmj8891.cpp index 8a20330d1f7..f941d6c61bf 100644 --- a/src/mame/video/nbmj8891.cpp +++ b/src/mame/video/nbmj8891.cpp @@ -313,7 +313,7 @@ void nbmj8891_state::device_timer(emu_timer &timer, device_timer_id id, int para m_nb1413m3->m_busyflag = 1; break; default: - assert_always(FALSE, "Unknown id in nbmj8891_state::device_timer"); + assert_always(false, "Unknown id in nbmj8891_state::device_timer"); } } diff --git a/src/mame/video/nbmj8900.cpp b/src/mame/video/nbmj8900.cpp index 47527e12186..eb1693d7896 100644 --- a/src/mame/video/nbmj8900.cpp +++ b/src/mame/video/nbmj8900.cpp @@ -205,7 +205,7 @@ void nbmj8900_state::device_timer(emu_timer &timer, device_timer_id id, int para m_nb1413m3->m_busyflag = 1; break; default: - assert_always(FALSE, "Unknown id in nbmj8900_state::device_timer"); + assert_always(false, "Unknown id in nbmj8900_state::device_timer"); } } diff --git a/src/mame/video/nbmj8991.cpp b/src/mame/video/nbmj8991.cpp index eb817e579b8..f30184c2d21 100644 --- a/src/mame/video/nbmj8991.cpp +++ b/src/mame/video/nbmj8991.cpp @@ -173,7 +173,7 @@ void nbmj8991_state::device_timer(emu_timer &timer, device_timer_id id, int para m_nb1413m3->m_busyflag = 1; break; default: - assert_always(FALSE, "Unknown id in nbmj8991_state::device_timer"); + assert_always(false, "Unknown id in nbmj8991_state::device_timer"); } } diff --git a/src/mame/video/nbmj9195.cpp b/src/mame/video/nbmj9195.cpp index 38a15086760..828f18e646c 100644 --- a/src/mame/video/nbmj9195.cpp +++ b/src/mame/video/nbmj9195.cpp @@ -187,7 +187,7 @@ void nbmj9195_state::device_timer(emu_timer &timer, device_timer_id id, int para m_nb19010_busyflag = 1; break; default: - assert_always(FALSE, "Unknown id in nbmj9195_state::device_timer"); + assert_always(false, "Unknown id in nbmj9195_state::device_timer"); } } diff --git a/src/mame/video/ninjakd2.cpp b/src/mame/video/ninjakd2.cpp index 2815ab6ab2f..ad398a36310 100644 --- a/src/mame/video/ninjakd2.cpp +++ b/src/mame/video/ninjakd2.cpp @@ -139,11 +139,11 @@ void ninjakd2_state::video_init_common(uint32_t vram_alloc_size) save_item(NAME(m_robokid_bg2_bank)); } -static int stencil_ninjakd2( uint16_t pal ); -static int stencil_mnight( uint16_t pal ); -static int stencil_arkarea( uint16_t pal ); -static int stencil_robokid( uint16_t pal ); -static int stencil_omegaf( uint16_t pal ); +static bool stencil_ninjakd2( uint16_t pal ); +static bool stencil_mnight( uint16_t pal ); +static bool stencil_arkarea( uint16_t pal ); +static bool stencil_robokid( uint16_t pal ); +static bool stencil_omegaf( uint16_t pal ); void ninjakd2_state::video_start() { @@ -409,11 +409,11 @@ void ninjakd2_state::draw_sprites( bitmap_ind16 &bitmap) } } -static int stencil_ninjakd2( uint16_t pal ) { return( (pal & 0xf0) == 0xf0 ); } -static int stencil_mnight( uint16_t pal ) { return( (pal & 0xf0) == 0xf0 ); } -static int stencil_arkarea( uint16_t pal ) { return( (pal & 0xf0) == 0xf0 ); } -static int stencil_robokid( uint16_t pal ) { return( (pal & 0xf0) < 0xe0 ); } -static int stencil_omegaf( uint16_t pal ) { return( TRUE ); } +static bool stencil_ninjakd2( uint16_t pal ) { return( (pal & 0xf0) == 0xf0 ); } +static bool stencil_mnight( uint16_t pal ) { return( (pal & 0xf0) == 0xf0 ); } +static bool stencil_arkarea( uint16_t pal ) { return( (pal & 0xf0) == 0xf0 ); } +static bool stencil_robokid( uint16_t pal ) { return( (pal & 0xf0) < 0xe0 ); } +static bool stencil_omegaf( uint16_t pal ) { return( true ); } ////// OVERDRAW STENCIL UNKNOWN ////// NINJAKD2 023459ABCDE F 1678 ////// MNIGHT 0134568ABCDE F 279 diff --git a/src/mame/video/niyanpai.cpp b/src/mame/video/niyanpai.cpp index 6d9a3bcfe92..e720dfebeb8 100644 --- a/src/mame/video/niyanpai.cpp +++ b/src/mame/video/niyanpai.cpp @@ -170,7 +170,7 @@ void niyanpai_state::device_timer(emu_timer &timer, device_timer_id id, int para m_nb19010_busyflag = 1; break; default: - assert_always(FALSE, "Unknown id in niyanpai_state::device_timer"); + assert_always(false, "Unknown id in niyanpai_state::device_timer"); } } diff --git a/src/mame/video/pastelg.cpp b/src/mame/video/pastelg.cpp index c53d40f3c73..d8148976217 100644 --- a/src/mame/video/pastelg.cpp +++ b/src/mame/video/pastelg.cpp @@ -147,7 +147,7 @@ void pastelg_state::device_timer(emu_timer &timer, device_timer_id id, int param m_nb1413m3->m_busyflag = 1; break; default: - assert_always(FALSE, "Unknown id in pastelg_state::device_timer"); + assert_always(false, "Unknown id in pastelg_state::device_timer"); } } diff --git a/src/mame/video/rallyx.cpp b/src/mame/video/rallyx.cpp index 74606591b2f..f0368f335c7 100644 --- a/src/mame/video/rallyx.cpp +++ b/src/mame/video/rallyx.cpp @@ -488,7 +488,7 @@ void rallyx_state::locomotn_draw_sprites( screen_device &screen, bitmap_ind16 &b } } -void rallyx_state::rallyx_draw_bullets( bitmap_ind16 &bitmap, const rectangle &cliprect, int transpen ) +void rallyx_state::rallyx_draw_bullets( bitmap_ind16 &bitmap, const rectangle &cliprect, bool transpen ) { int offs; @@ -518,7 +518,7 @@ void rallyx_state::rallyx_draw_bullets( bitmap_ind16 &bitmap, const rectangle &c } } -void rallyx_state::jungler_draw_bullets( bitmap_ind16 &bitmap, const rectangle &cliprect, int transpen ) +void rallyx_state::jungler_draw_bullets( bitmap_ind16 &bitmap, const rectangle &cliprect, bool transpen ) { int offs; @@ -546,7 +546,7 @@ void rallyx_state::jungler_draw_bullets( bitmap_ind16 &bitmap, const rectangle & } } -void rallyx_state::locomotn_draw_bullets( bitmap_ind16 &bitmap, const rectangle &cliprect, int transpen ) +void rallyx_state::locomotn_draw_bullets( bitmap_ind16 &bitmap, const rectangle &cliprect, bool transpen ) { int offs; @@ -608,9 +608,9 @@ uint32_t rallyx_state::screen_update_rallyx(screen_device &screen, bitmap_ind16 m_bg_tilemap->draw(screen, bitmap, bg_clip, 1, 1); m_fg_tilemap->draw(screen, bitmap, fg_clip, 1, 1); - rallyx_draw_bullets(bitmap, cliprect, TRUE); + rallyx_draw_bullets(bitmap, cliprect, true); rallyx_draw_sprites(screen, bitmap, cliprect); - rallyx_draw_bullets(bitmap, cliprect, FALSE); + rallyx_draw_bullets(bitmap, cliprect, false); return 0; } @@ -642,9 +642,9 @@ uint32_t rallyx_state::screen_update_jungler(screen_device &screen, bitmap_ind16 m_bg_tilemap->draw(screen, bitmap, bg_clip, 1, 0); m_fg_tilemap->draw(screen, bitmap, fg_clip, 1, 0); - jungler_draw_bullets(bitmap, cliprect, TRUE); + jungler_draw_bullets(bitmap, cliprect, true); rallyx_draw_sprites(screen, bitmap, cliprect); - jungler_draw_bullets(bitmap, cliprect, FALSE); + jungler_draw_bullets(bitmap, cliprect, false); if (m_stars_enable) draw_stars(bitmap, cliprect); @@ -687,9 +687,9 @@ uint32_t rallyx_state::screen_update_locomotn(screen_device &screen, bitmap_ind1 m_bg_tilemap->draw(screen, bitmap, bg_clip, 1, 1); m_fg_tilemap->draw(screen, bitmap, fg_clip, 1, 1); - locomotn_draw_bullets(bitmap, cliprect, TRUE); + locomotn_draw_bullets(bitmap, cliprect, true); locomotn_draw_sprites(screen, bitmap, cliprect); - locomotn_draw_bullets(bitmap, cliprect, FALSE); + locomotn_draw_bullets(bitmap, cliprect, false); if (m_stars_enable) draw_stars(bitmap, cliprect); diff --git a/src/mame/video/segag80r.cpp b/src/mame/video/segag80r.cpp index 7e41cc65d76..908da5a53a1 100644 --- a/src/mame/video/segag80r.cpp +++ b/src/mame/video/segag80r.cpp @@ -29,7 +29,7 @@ void segag80r_state::device_timer(emu_timer &timer, device_timer_id id, int para m_vblank_latch = 0; break; default: - assert_always(FALSE, "Unknown id in segag80r_state::device_timer"); + assert_always(false, "Unknown id in segag80r_state::device_timer"); } } diff --git a/src/mame/video/segag80v.cpp b/src/mame/video/segag80v.cpp index df294e575a1..b643b120397 100644 --- a/src/mame/video/segag80v.cpp +++ b/src/mame/video/segag80v.cpp @@ -77,9 +77,9 @@ */ -inline int segag80v_state::adjust_xy(int rawx, int rawy, int *outx, int *outy) +inline bool segag80v_state::adjust_xy(int rawx, int rawy, int *outx, int *outy) { - int clipped = FALSE; + bool clipped = false; /* first apply the XOR at 0x200 */ *outx = (rawx & 0x7ff) ^ 0x200; @@ -87,17 +87,17 @@ inline int segag80v_state::adjust_xy(int rawx, int rawy, int *outx, int *outy) /* apply clipping logic to X */ if ((*outx & 0x600) == 0x200) - *outx = 0x000, clipped = TRUE; + *outx = 0x000, clipped = true; else if ((*outx & 0x600) == 0x400) - *outx = 0x3ff, clipped = TRUE; + *outx = 0x3ff, clipped = true; else *outx &= 0x3ff; /* apply clipping logic to Y */ if ((*outy & 0x600) == 0x200) - *outy = 0x000, clipped = TRUE; + *outy = 0x000, clipped = true; else if ((*outy & 0x600) == 0x400) - *outy = 0x3ff, clipped = TRUE; + *outy = 0x3ff, clipped = true; else *outy &= 0x3ff; diff --git a/src/mame/video/stic.cpp b/src/mame/video/stic.cpp index 7ecf0cd38d6..20106936c97 100644 --- a/src/mame/video/stic.cpp +++ b/src/mame/video/stic.cpp @@ -170,7 +170,7 @@ void stic_device::intv_plot_box(bitmap_ind16 &bitmap, int x, int y, int w, int h } -int stic_device::sprites_collide(int spriteNum1, int spriteNum2) +bool stic_device::sprites_collide(int spriteNum1, int spriteNum2) { int16_t x0, y0, w0, h0, x1, y1, w1, h1, x2, y2, w2, h2; @@ -188,7 +188,7 @@ int stic_device::sprites_collide(int spriteNum1, int spriteNum2) if ((x1 >= x2 + w2) || (y1 >= y2 + h2) || (x2 >= x1 + w1) || (y2 >= y1 + h1)) - return FALSE; + return false; // iterate over the intersecting bits to see if any touch x0 = std::max(x1, x2); @@ -205,11 +205,11 @@ int stic_device::sprites_collide(int spriteNum1, int spriteNum2) { if (m_sprite_buffers[spriteNum1][x0 + x1][y0 + y1] && m_sprite_buffers[spriteNum2][x0 + x2][y0 + y2]) - return TRUE; + return true; } } - return FALSE; + return false; } void stic_device::determine_sprite_collisions() @@ -423,8 +423,8 @@ void stic_device::copy_sprites_to_background(bitmap_ind16 &bitmap) if (s->xpos == 0 || (!s->coll && !s->visible)) continue; - borderCollision = FALSE; - foregroundCollision = FALSE; + borderCollision = false; + foregroundCollision = false; spritePixelHeight = (s->quady ? 4 : 1) * (s->doubley ? 2 : 1) * (s->doubleyres ? 2 : 1) * STIC_CARD_HEIGHT; width = (s->doublex ? 2 : 1) * STIC_CARD_WIDTH; @@ -451,7 +451,7 @@ void stic_device::copy_sprites_to_background(bitmap_ind16 &bitmap) if ((nextX < leftBorder) || (nextX > rightBorder) || (nextY < topBorder) || (nextY > bottomBorder)) { - borderCollision = TRUE; + borderCollision = true; continue; } @@ -460,7 +460,7 @@ void stic_device::copy_sprites_to_background(bitmap_ind16 &bitmap) //check for foreground collision if (currentPixel & FOREGROUND_BIT) { - foregroundCollision = TRUE; + foregroundCollision = true; if (s->behind_foreground) continue; } diff --git a/src/mame/video/stic.h b/src/mame/video/stic.h index ce13bf4cb86..4a341297c65 100644 --- a/src/mame/video/stic.h +++ b/src/mame/video/stic.h @@ -506,7 +506,7 @@ private: void intv_set_pixel(bitmap_ind16 &bitmap, int x, int y, uint32_t color); uint32_t intv_get_pixel(bitmap_ind16 &bitmap, int x, int y); void intv_plot_box(bitmap_ind16 &bm, int x, int y, int w, int h, int color); - int sprites_collide(int spriteNum1, int spriteNum2); + bool sprites_collide(int spriteNum1, int spriteNum2); void determine_sprite_collisions(); void render_sprites(); void render_line(bitmap_ind16 &bitmap, uint8_t nextByte, uint16_t x, uint16_t y, uint8_t fgcolor, uint8_t bgcolor); diff --git a/src/mame/video/tank8.cpp b/src/mame/video/tank8.cpp index 456dcaa38c7..b0f292c8ac9 100644 --- a/src/mame/video/tank8.cpp +++ b/src/mame/video/tank8.cpp @@ -177,7 +177,7 @@ void tank8_state::device_timer(emu_timer &timer, device_timer_id id, int param, set_collision(param); break; default: - assert_always(FALSE, "Unknown id in tank8_state::device_timer"); + assert_always(false, "Unknown id in tank8_state::device_timer"); } } diff --git a/src/mame/video/triplhnt.cpp b/src/mame/video/triplhnt.cpp index 741bb4c2da3..93a46f5bce6 100644 --- a/src/mame/video/triplhnt.cpp +++ b/src/mame/video/triplhnt.cpp @@ -34,7 +34,7 @@ void triplhnt_state::device_timer(emu_timer &timer, device_timer_id id, int para triplhnt_set_collision(param); break; default: - assert_always(FALSE, "Unknown id in triplhnt_state::device_timer"); + assert_always(false, "Unknown id in triplhnt_state::device_timer"); } } diff --git a/src/mame/video/vc4000.cpp b/src/mame/video/vc4000.cpp index 49a9d3ec218..a0af5563c58 100644 --- a/src/mame/video/vc4000.cpp +++ b/src/mame/video/vc4000.cpp @@ -88,23 +88,23 @@ READ8_MEMBER( vc4000_state::vc4000_video_r ) if (m_video.sprites[3].finished) { data |= 1; - m_video.sprites[3].finished = FALSE; + m_video.sprites[3].finished = false; } if (m_video.sprites[2].finished) { data |= 2; - m_video.sprites[2].finished = FALSE; + m_video.sprites[2].finished = false; } if (m_video.sprites[1].finished) { data |= 4; - m_video.sprites[1].finished = FALSE; + m_video.sprites[1].finished = false; } if (m_video.sprites[0].finished) { data |= 8; - m_video.sprites[0].finished = FALSE; + m_video.sprites[0].finished = false; } break; @@ -416,10 +416,10 @@ void vc4000_state::vc4000_sprite_update(bitmap_ind16 &bitmap, uint8_t *collision This->y=This->data->y1; This->state=0; This->delay=0; - This->finished=FALSE; + This->finished=false; } - This->finished_now=FALSE; + This->finished_now=false; if (m_video.line>VC4000_END_LINE) return; @@ -455,8 +455,8 @@ void vc4000_state::vc4000_sprite_update(bitmap_ind16 &bitmap, uint8_t *collision if (This->state>10) { - This->finished=TRUE; - This->finished_now=TRUE; + This->finished=true; + This->finished_now=true; } break; @@ -509,8 +509,8 @@ void vc4000_state::vc4000_sprite_update(bitmap_ind16 &bitmap, uint8_t *collision This->delay=0; This->state++; if (This->state<23) break; - This->finished=TRUE; - This->finished_now=TRUE; + This->finished=true; + This->finished_now=true; This->state=11; break; } diff --git a/src/mame/video/vrender0.cpp b/src/mame/video/vrender0.cpp index 64e5098825c..0d681d8ba74 100644 --- a/src/mame/video/vrender0.cpp +++ b/src/mame/video/vrender0.cpp @@ -395,7 +395,7 @@ static const _DrawTemplate DrawTile[]= #define Packet(i) space.read_word(PacketPtr + 2 * i) -//Returns TRUE if the operation was a flip (sync or async) +//Returns true if the operation was a flip (sync or async) int vr0video_device::vrender0_ProcessPacket(uint32_t PacketPtr, uint16_t *Dest, uint8_t *TEXTURE) { address_space &space = m_cpu->space(AS_PROGRAM); diff --git a/src/mame/video/zaxxon.cpp b/src/mame/video/zaxxon.cpp index c9b67568b9e..8108599ebfc 100644 --- a/src/mame/video/zaxxon.cpp +++ b/src/mame/video/zaxxon.cpp @@ -447,7 +447,7 @@ void zaxxon_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, uint32_t zaxxon_state::screen_update_zaxxon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - draw_background(bitmap, cliprect, TRUE); + draw_background(bitmap, cliprect, true); draw_sprites(bitmap, cliprect, 0x140, 0x180); m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); return 0; @@ -456,7 +456,7 @@ uint32_t zaxxon_state::screen_update_zaxxon(screen_device &screen, bitmap_ind16 uint32_t zaxxon_state::screen_update_futspy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - draw_background(bitmap, cliprect, TRUE); + draw_background(bitmap, cliprect, true); draw_sprites(bitmap, cliprect, 0x180, 0x180); m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); return 0; @@ -465,7 +465,7 @@ uint32_t zaxxon_state::screen_update_futspy(screen_device &screen, bitmap_ind16 uint32_t zaxxon_state::screen_update_razmataz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - draw_background(bitmap, cliprect, FALSE); + draw_background(bitmap, cliprect, false); draw_sprites(bitmap, cliprect, 0x140, 0x180); m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); return 0; @@ -474,7 +474,7 @@ uint32_t zaxxon_state::screen_update_razmataz(screen_device &screen, bitmap_ind1 uint32_t zaxxon_state::screen_update_congo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - draw_background(bitmap, cliprect, TRUE); + draw_background(bitmap, cliprect, true); draw_sprites(bitmap, cliprect, 0x280, 0x180); m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); return 0; diff --git a/src/mame/video/zx.cpp b/src/mame/video/zx.cpp index a786911adf6..197e1cd0120 100644 --- a/src/mame/video/zx.cpp +++ b/src/mame/video/zx.cpp @@ -32,7 +32,7 @@ void zx_state::device_timer(emu_timer &timer, device_timer_id id, int param, voi zx_ula_hsync(); break; default: - assert_always(FALSE, "Unknown id in zx_state::device_timer"); + assert_always(false, "Unknown id in zx_state::device_timer"); } } |