diff options
author | 2019-07-11 09:07:20 +1000 | |
---|---|---|
committer | 2019-07-11 09:07:20 +1000 | |
commit | df99ce2ec0e82020a6fee89f4ffaf7f1468fec31 (patch) | |
tree | f6b1459a7e882047476bf817a410ab44eac3e99a /src/mame/drivers/segald.cpp | |
parent | 704355279e6b62fa93d80e948073f90eba0032f2 (diff) | |
parent | 5eaac5e857176b56c990f6bb864a1a5c27b6cf6d (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/mame/drivers/segald.cpp')
-rw-r--r-- | src/mame/drivers/segald.cpp | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/src/mame/drivers/segald.cpp b/src/mame/drivers/segald.cpp index 8f5f3de8a64..24d4ca2866c 100644 --- a/src/mame/drivers/segald.cpp +++ b/src/mame/drivers/segald.cpp @@ -82,15 +82,13 @@ private: /* VIDEO GOODS */ void segald_state::astron_draw_characters(bitmap_rgb32 &bitmap,const rectangle &cliprect) { - uint8_t characterX, characterY; - - for (characterX = 0; characterX < 32; characterX++) + for (uint8_t character_x = 0; character_x < 32; character_x++) { - for (characterY = 0; characterY < 32; characterY++) + for (uint8_t character_y = 0; character_y < 32; character_y++) { - int current_screen_character = (characterY*32) + characterX; - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, m_fix_ram[current_screen_character], - 1, 0, 0, characterX*8, characterY*8, 0); + int current_screen_character = (character_y * 32) + character_x; + m_gfxdecode->gfx(0)->transpen(bitmap, cliprect, m_fix_ram[current_screen_character], + 1, 0, 0, character_x * 8, character_y * 8, 0); } } } @@ -107,15 +105,11 @@ void segald_state::astron_draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cl /* const uint8_t SPR_GFXOFS_LO = 6;*/ /* const uint8_t SPR_GFXOFS_HI = 7;*/ - int sx,sy; - int spr_number; - int spr_base; - - for (spr_number = 0; spr_number < 32; spr_number++) + for (int spr_number = 0; spr_number < 32; spr_number++) { - spr_base = 0x10 * spr_number; - sy = m_obj_ram[spr_base + SPR_Y_TOP]; - sx = m_obj_ram[spr_base + SPR_X_LO]; + int spr_base = 0x10 * spr_number; + int sy = m_obj_ram[spr_base + SPR_Y_TOP]; + int sx = m_obj_ram[spr_base + SPR_X_LO]; if (sx != 0 || sy != 0) logerror("Hey! A sprite's not at 0,0 : %d %d", sx, sy); @@ -387,7 +381,6 @@ void segald_state::astron(machine_config &config) PIONEER_LDV1000(config, m_laserdisc, 0); m_laserdisc->set_overlay(256, 256, FUNC(segald_state::screen_update_astron)); - m_laserdisc->set_overlay_palette(m_palette); m_laserdisc->add_route(0, "lspeaker", 1.0); m_laserdisc->add_route(1, "rspeaker", 1.0); |