diff options
author | Vas Crabb <vas@vastheman.com> | 2015-03-12 21:07:24 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2015-03-12 21:07:24 +1100 |
commit | 2579c27ac0f834db7dbbf29fbacbe59a4d9de4a1 (patch) | |
tree | 552199c403302bd197d02c7280dafc9fc4b06983 | |
parent | a761b3fcaae04e114c4911acaf7fa7eeec65f3e9 (diff) |
Little cleanup
-rw-r--r-- | src/mame/drivers/goldstar.c | 59 | ||||
-rw-r--r-- | src/mame/includes/goldstar.h | 1 | ||||
-rw-r--r-- | src/mame/layout/crazybon.lay | 24 | ||||
-rw-r--r-- | src/mame/video/goldstar.c | 231 |
4 files changed, 125 insertions, 190 deletions
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index 342af792bc1..1e4972f7c85 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -179,21 +179,23 @@ READ8_MEMBER(goldstar_state::protection_r) WRITE8_MEMBER(goldstar_state::goldstar_lamps_w) { /* bits - 7654 3210 goldstar - ---- ---x Bet Red / Card 2. - ---- --x- Stop 3 / Small / Info / Card 1 - ---- -x-- Bet Blue / Double / Card 3 - ---- x--- Stop 1 / Take - ---x ---- Stop 2 / Big / Bonus - --x- ---- Start / Stop All / Card 4 - - 7654 3210 cm/cmaster cmpacman/cmtetris tonypok schery97 pokonl97 match98 - ---- ---x stop/big bet 10/big hit/stop - ---- --x- d-up d-up big/small d-up d-up - ---- -x-- take take/stop take/d-up take/select take/select take - ---- x--- bet bet bet bet bet 1 bet - ---x ---- info info small small - --x- ---- start start deal start start start + 7654 3210 goldstar crazybon + ---- ---x Bet Red / Card 2 + ---- --x- Stop 3 / Small / Info / Card 1 Start + ---- -x-- Bet Blue / Double Up / Card 3 + ---- x--- Stop 1 / Take Bet + ---x ---- Stop 2 / Big / Bonus Stop All / Take Score + --x- ---- Start / Stop All / Card 4 Double Up + -x-- ---- Small / Info + x--- ---- Big + + 7654 3210 cm/cmaster cmpacman/cmtetris tonypok schery97 pokonl97 match98 + ---- ---x stop/big bet 10/big hit/stop + ---- --x- d-up d-up big/small d-up d-up + ---- -x-- take take/stop take/d-up take/select take/select take + ---- x--- bet bet bet bet bet 1 bet + ---x ---- info info small small + --x- ---- start start deal start start start -x-- ---- hold all cm/cmaster use the same scheme @@ -208,6 +210,7 @@ WRITE8_MEMBER(goldstar_state::goldstar_lamps_w) output_set_lamp_value(4, (data >> 4) & 1); output_set_lamp_value(5, (data >> 5) & 1); output_set_lamp_value(6, (data >> 6) & 1); + output_set_lamp_value(7, (data >> 7) & 1); // popmessage("lamps: %02X", data); } @@ -692,30 +695,6 @@ static ADDRESS_MAP_START( cm_portmap, AS_IO, 8, cmaster_state ) ADDRESS_MAP_END -WRITE8_MEMBER(goldstar_state::pkrmast_lamps_w) -{ -/* bits - 7654 3210 - ---- --x- Start - ---- x--- Bet - ---x ---- Stop All / Take Score - --x- ---- Double Up - -x-- ---- Small / Info - x--- ---- Big - ---- -x-x Unused in Crazy Bonus -*/ - - output_set_lamp_value(0, (data >> 1) & 1); /* Start */ - output_set_lamp_value(1, (data >> 3) & 1); /* Bet */ - output_set_lamp_value(2, (data >> 4) & 1); /* Stop All / Take Score */ - output_set_lamp_value(3, (data >> 5) & 1); /* Double Up */ - output_set_lamp_value(4, (data >> 6) & 1); /* Small / Info */ - output_set_lamp_value(5, (data >> 7) & 1); /* Big */ - - if (data & 0x05) - popmessage("lamps: %02X", data); -} - WRITE8_MEMBER(goldstar_state::pkrmast_coincount_w) { /* bits @@ -751,7 +730,7 @@ static ADDRESS_MAP_START( pkrmast_portmap, AS_IO, 8, goldstar_state ) AM_RANGE(0x20, 0x20) AM_READ_PORT("DSW3-0") AM_RANGE(0x21, 0x21) AM_READ_PORT("DSW3-1") - AM_RANGE(0x22, 0x22) AM_WRITE(pkrmast_lamps_w) + AM_RANGE(0x22, 0x22) AM_WRITE(goldstar_lamps_w) AM_RANGE(0x24, 0x24) AM_WRITE(pkrmast_coincount_w) AM_RANGE(0x25, 0x25) AM_READ_PORT("DSW1") diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h index bcce55c173e..1f9aff7afc7 100644 --- a/src/mame/includes/goldstar.h +++ b/src/mame/includes/goldstar.h @@ -25,7 +25,6 @@ public: DECLARE_WRITE8_MEMBER(ncb3_port81_w); DECLARE_WRITE8_MEMBER(goldstar_lamps_w); DECLARE_WRITE8_MEMBER(cb3_lamps_w); - DECLARE_WRITE8_MEMBER(pkrmast_lamps_w); DECLARE_WRITE8_MEMBER(pkrmast_coincount_w); DECLARE_WRITE8_MEMBER(ladylinr_outport_w); DECLARE_WRITE8_MEMBER(goldstar_fg_vidram_w); diff --git a/src/mame/layout/crazybon.lay b/src/mame/layout/crazybon.lay index 0c54e8aae82..bfed6b53d98 100644 --- a/src/mame/layout/crazybon.lay +++ b/src/mame/layout/crazybon.lay @@ -203,50 +203,50 @@ <!-- define lamps --> - <bezel name="lamp0" element="start_b"> + <bezel name="lamp1" element="start_b"> <bounds x="3.45" y="3.08" width="0.50" height="0.24" /> </bezel> - <bezel name="lamp0" element="start"> + <bezel name="lamp1" element="start"> <bounds x="3.47" y="3.10" width="0.46" height="0.20" /> </bezel> - <bezel name="lamp1" element="bet_b"> + <bezel name="lamp3" element="bet_b"> <bounds x="0.05" y="3.08" width="0.40" height="0.24" /> </bezel> - <bezel name="lamp1" element="bet"> + <bezel name="lamp3" element="bet"> <bounds x="0.07" y="3.10" width="0.36" height="0.20" /> </bezel> - <bezel name="lamp2" element="stop_b"> + <bezel name="lamp4" element="stop_b"> <bounds x="1.4" y="3.08" width="0.50" height="0.24" /> </bezel> - <bezel name="lamp2" element="stop"> + <bezel name="lamp4" element="stop"> <bounds x="1.42" y="3.10" width="0.46" height="0.20" /> </bezel> - <bezel name="lamp3" element="dup_b"> + <bezel name="lamp5" element="dup_b"> <bounds x="0.65" y="3.08" width="0.50" height="0.24" /> </bezel> - <bezel name="lamp3" element="dup"> + <bezel name="lamp5" element="dup"> <bounds x="0.67" y="3.10" width="0.46" height="0.20" /> </bezel> - <bezel name="lamp4" element="stop_b"> + <bezel name="lamp6" element="stop_b"> <bounds x="2.7" y="3.08" width="0.50" height="0.24" /> </bezel> - <bezel name="lamp4" element="small"> + <bezel name="lamp6" element="small"> <bounds x="2.72" y="3.10" width="0.46" height="0.20" /> </bezel> - <bezel name="lamp5" element="stop_b"> + <bezel name="lamp7" element="stop_b"> <bounds x="2.05" y="3.08" width="0.50" height="0.24" /> </bezel> - <bezel name="lamp5" element="big"> + <bezel name="lamp7" element="big"> <bounds x="2.07" y="3.10" width="0.46" height="0.20" /> </bezel> diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c index 4fd63f5a166..cd884264080 100644 --- a/src/mame/video/goldstar.c +++ b/src/mame/video/goldstar.c @@ -34,12 +34,12 @@ WRITE8_MEMBER(goldstar_state::goldstar_fg_atrram_w) TILE_GET_INFO_MEMBER(goldstar_state::get_goldstar_fg_tile_info) { - int code = m_fg_vidram[tile_index]; - int attr = m_fg_atrram[tile_index]; + int const code = m_fg_vidram[tile_index]; + int const attr = m_fg_atrram[tile_index]; SET_TILE_INFO_MEMBER(0, - code | (attr & 0xf0)<<4, - attr&0x0f, + code | (attr & 0xf0) << 4, + attr & 0x0f, 0); } @@ -47,12 +47,12 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_goldstar_fg_tile_info) // colour / high tile bits are swapped around TILE_GET_INFO_MEMBER(goldstar_state::get_cherrym_fg_tile_info) { - int code = m_fg_vidram[tile_index]; - int attr = m_fg_atrram[tile_index]; + int const code = m_fg_vidram[tile_index]; + int const attr = m_fg_atrram[tile_index]; SET_TILE_INFO_MEMBER(0, - code | (attr & 0x0f)<<8, - (attr&0xf0)>>4, + code | (attr & 0x0f) << 8, + (attr & 0xf0) >> 4, 0); } @@ -66,10 +66,8 @@ WRITE8_MEMBER(goldstar_state::goldstar_reel1_ram_w) TILE_GET_INFO_MEMBER(goldstar_state::get_goldstar_reel1_tile_info) { - int code = m_reel1_ram[tile_index]; - SET_TILE_INFO_MEMBER(1, - code, + m_reel1_ram[tile_index], m_bgcolor, 0); } @@ -83,10 +81,8 @@ WRITE8_MEMBER(goldstar_state::goldstar_reel2_ram_w) TILE_GET_INFO_MEMBER(goldstar_state::get_goldstar_reel2_tile_info) { - int code = m_reel2_ram[tile_index]; - SET_TILE_INFO_MEMBER(1, - code, + m_reel2_ram[tile_index], m_bgcolor, 0); } @@ -99,10 +95,8 @@ WRITE8_MEMBER(goldstar_state::goldstar_reel3_ram_w) TILE_GET_INFO_MEMBER(goldstar_state::get_goldstar_reel3_tile_info) { - int code = m_reel3_ram[tile_index]; - SET_TILE_INFO_MEMBER(1, - code, + m_reel3_ram[tile_index], m_bgcolor, 0); } @@ -159,23 +153,20 @@ WRITE8_MEMBER(goldstar_state::goldstar_fa00_w) UINT32 goldstar_state::screen_update_goldstar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - int i; - bitmap.fill(m_palette->black_pen(), cliprect); - if (!(m_cm_enable_reg &0x01)) + if (!(m_cm_enable_reg & 0x01)) return 0; - if (m_cm_enable_reg &0x08) + if (m_cm_enable_reg & 0x08) { - for (i= 0;i < 64;i++) + for (int i = 0; i < 64; i++) { m_reel1_tilemap->set_scrolly(i, m_reel1_scroll[i]); m_reel2_tilemap->set_scrolly(i, m_reel2_scroll[i]); m_reel3_tilemap->set_scrolly(i, m_reel3_scroll[i]); } - // are these hardcoded, or registers? const rectangle visible1(0*8, (14+48)*8-1, 4*8, (4+7)*8-1); const rectangle visible2(0*8, (14+48)*8-1, 12*8, (12+7)*8-1); @@ -186,22 +177,20 @@ UINT32 goldstar_state::screen_update_goldstar(screen_device &screen, bitmap_ind1 m_reel3_tilemap->draw(screen, bitmap, visible3, 0, 0); } - if (m_cm_enable_reg &0x04) + if (m_cm_enable_reg & 0x04) { if (memregion("user1")->base()) { gfx_element *gfx = m_gfxdecode->gfx(2); - int girlyscroll = (INT8)((m_cm_girl_scroll & 0xf0)); - int girlxscroll = (INT8)((m_cm_girl_scroll & 0x0f)<<4); + int const girlyscroll = (INT8)((m_cm_girl_scroll & 0xf0)); + int const girlxscroll = (INT8)((m_cm_girl_scroll & 0x0f) << 4); gfx->zoom_transpen(bitmap,cliprect,m_cmaster_girl_num,m_cmaster_girl_pal,0,0,-(girlxscroll*2),-(girlyscroll), 0x20000, 0x10000,0); } } - if (m_cm_enable_reg &0x02) - { + if (m_cm_enable_reg & 0x02) m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); - } return 0; } @@ -209,23 +198,21 @@ UINT32 goldstar_state::screen_update_goldstar(screen_device &screen, bitmap_ind1 UINT32 goldstar_state::screen_update_cmast91(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - int i; - bitmap.fill(m_palette->black_pen(), cliprect); - if (!(m_cm_enable_reg &0x01)) + if (!(m_cm_enable_reg & 0x01)) return 0; - if (m_cm_enable_reg &0x08) + if (m_cm_enable_reg & 0x08) { - for (i= 0;i < 64;i++) + for (int i = 0; i < 64; i++) { m_reel1_tilemap->set_scrolly(i, m_reel1_scroll[i]); m_reel2_tilemap->set_scrolly(i, m_reel2_scroll[i]); m_reel3_tilemap->set_scrolly(i, m_reel3_scroll[i]); } - const rectangle visible1(0*8, (14+48)*8-1, 4*8, (4+7)*8-1); /* same start for reel1 */ + const rectangle visible1(0*8, (14+48)*8-1, 4*8, (4+7)*8-1); /* same start for reel1 */ const rectangle visible2(0*8, (14+48)*8-1, 11*8, (12+7)*8-1); /* 4 pixels less for reel2 */ const rectangle visible3(0*8, (14+48)*8-1, 19*8, (19+7)*8-1); /* 8 pixels less for reel3 */ @@ -234,10 +221,8 @@ UINT32 goldstar_state::screen_update_cmast91(screen_device &screen, bitmap_ind16 m_reel3_tilemap->draw(screen, bitmap, visible3, 0, 0); } - if (m_cm_enable_reg &0x02) - { + if (m_cm_enable_reg & 0x02) m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); - } return 0; } @@ -287,8 +272,8 @@ WRITE8_MEMBER(cmaster_state::background_col_w) */ - m_cmaster_girl_num = (data >> 4)&0x7; - m_cmaster_girl_pal = (data >> 2)&0x3; + m_cmaster_girl_num = (data >> 4) & 0x7; + m_cmaster_girl_pal = (data >> 2) & 0x3; //bgcolor = (data & 0x03) >> 0; @@ -310,40 +295,36 @@ WRITE8_MEMBER(cmaster_state::background_col_w) UINT32 cmaster_state::screen_update_amcoe1a(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - int i; - bitmap.fill(m_palette->black_pen(), cliprect); - if (!(m_cm_enable_reg &0x01)) + if (!(m_cm_enable_reg & 0x01)) return 0; - if (m_cm_enable_reg &0x08) + if (m_cm_enable_reg & 0x08) { - for (i= 0;i < 64;i++) + for (int i= 0;i < 64;i++) { m_reel1_tilemap->set_scrolly(i, m_reel1_scroll[i]); m_reel2_tilemap->set_scrolly(i, m_reel2_scroll[i]); m_reel3_tilemap->set_scrolly(i, m_reel3_scroll[i]); } - const rectangle visible1(0*8, (14+48)*8-1, 4*8, (4+6)*8-1); - const rectangle visible2(0*8, (14+48)*8-1, 10*8, (10+6)*8-1); - const rectangle visible3(0*8, (14+48)*8-1, 16*8, (16+6)*8-1); + rectangle const visible1(0*8, (14+48)*8-1, 4*8, (4+6)*8-1); + rectangle const visible2(0*8, (14+48)*8-1, 10*8, (10+6)*8-1); + rectangle const visible3(0*8, (14+48)*8-1, 16*8, (16+6)*8-1); m_reel1_tilemap->draw(screen, bitmap, visible1, 0, 0); m_reel2_tilemap->draw(screen, bitmap, visible2, 0, 0); m_reel3_tilemap->draw(screen, bitmap, visible3, 0, 0); } - if (m_cm_enable_reg &0x04) + if (m_cm_enable_reg & 0x04) { // no girls } - if (m_cm_enable_reg &0x02) - { + if (m_cm_enable_reg & 0x02) m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); - } return 0; } @@ -352,12 +333,12 @@ UINT32 cmaster_state::screen_update_amcoe1a(screen_device &screen, bitmap_ind16 TILE_GET_INFO_MEMBER(wingco_state::get_magical_fg_tile_info) { - int code = m_fg_vidram[tile_index]; - int attr = m_fg_atrram[tile_index]; + int const code = m_fg_vidram[tile_index]; + int const attr = m_fg_atrram[tile_index]; SET_TILE_INFO_MEMBER(0, - (code | (attr & 0xf0)<<4)+m_tile_bank*0x1000, - attr&0x0f, + (code | (attr & 0xf0)<<4) + (m_tile_bank * 0x1000), + attr & 0x0f, 0); } @@ -395,38 +376,35 @@ VIDEO_START_MEMBER(wingco_state, magical) UINT32 wingco_state::screen_update_bingowng(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - int i; - bitmap.fill(m_palette->black_pen(), cliprect); - if (!(m_cm_enable_reg &0x01)) + if (!(m_cm_enable_reg & 0x01)) return 0; - if (m_cm_enable_reg &0x08) + if (m_cm_enable_reg & 0x08) { - for (i= 0;i < 64;i++) + for (int i = 0; i < 64; i++) { m_reel1_tilemap->set_scrolly(i, m_reel1_scroll[i]); } - - const rectangle visible1(0*8, (14+48)*8-1, 3*8, (4+7)*8-1); + rectangle const visible1(0*8, (14+48)*8-1, 3*8, (4+7)*8-1); m_reel1_tilemap->draw(screen, bitmap, visible1, 0, 0); } - if (m_cm_enable_reg &0x04) + if (m_cm_enable_reg & 0x04) { if (memregion("user1")->base()) { gfx_element *gfx = m_gfxdecode->gfx(2); - int girlyscroll = (INT8)((m_cm_girl_scroll & 0xf0)); - int girlxscroll = (INT8)((m_cm_girl_scroll & 0x0f)<<4); + int const girlyscroll = (INT8)((m_cm_girl_scroll & 0xf0)); + int const girlxscroll = (INT8)((m_cm_girl_scroll & 0x0f)<<4); gfx->zoom_transpen(bitmap,cliprect,m_cmaster_girl_num,m_cmaster_girl_pal,0,0,-(girlxscroll*2),-(girlyscroll), 0x20000, 0x10000,0); } } - if (m_cm_enable_reg &0x02) + if (m_cm_enable_reg & 0x02) { m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); } @@ -436,28 +414,25 @@ UINT32 wingco_state::screen_update_bingowng(screen_device &screen, bitmap_ind16 UINT32 wingco_state::screen_update_magical(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - int i; - bitmap.fill(m_palette->black_pen(), cliprect); - if (!(m_cm_enable_reg &0x01)) + if (!(m_cm_enable_reg & 0x01)) return 0; - if (m_cm_enable_reg &0x08) + if (m_cm_enable_reg & 0x08) { // guess, could be wrong, but different screens clearly need different reel layouts if (m_vidreg & 2) { - for (i= 0;i < 32;i++) + for (int i = 0; i < 32; i++) { m_reel1_tilemap->set_scrolly(i, m_reel1_scroll[i*2]); m_reel2_tilemap->set_scrolly(i, m_reel2_scroll[i*2]); // m_reel3_tilemap->set_scrolly(i, m_reel3_scroll[i*2]); } - - const rectangle visible1alt(0*8, (16+48)*8-1, 4*8, 16*8-1); - const rectangle visible2alt(0*8, (16+48)*8-1, 16*8, 28*8-1); + rectangle const visible1alt(0*8, (16+48)*8-1, 4*8, 16*8-1); + rectangle const visible2alt(0*8, (16+48)*8-1, 16*8, 28*8-1); m_reel1_tilemap->draw(screen, bitmap, visible1alt, 0, 0); m_reel2_tilemap->draw(screen, bitmap, visible2alt, 0, 0); @@ -465,17 +440,16 @@ UINT32 wingco_state::screen_update_magical(screen_device &screen, bitmap_ind16 & } else { - for (i= 0;i < 32;i++) + for (int i = 0; i < 32; i++) { m_reel1_tilemap->set_scrolly(i, m_reel1_scroll[i*2]); m_reel2_tilemap->set_scrolly(i, m_reel2_scroll[i*2]); m_reel3_tilemap->set_scrolly(i, m_reel3_scroll[i*2]); } - - const rectangle visible1(0*8, (14+48)*8-1, 4*8, (4+8)*8-1); - const rectangle visible2(0*8, (14+48)*8-1, 12*8, (12+8)*8-1); - const rectangle visible3(0*8, (14+48)*8-1, 20*8, (20+8)*8-1); + rectangle const visible1(0*8, (14+48)*8-1, 4*8, (4+8)*8-1); + rectangle const visible2(0*8, (14+48)*8-1, 12*8, (12+8)*8-1); + rectangle const visible3(0*8, (14+48)*8-1, 20*8, (20+8)*8-1); m_reel1_tilemap->draw(screen, bitmap, visible1, 0, 0); m_reel2_tilemap->draw(screen, bitmap, visible2, 0, 0); @@ -483,10 +457,8 @@ UINT32 wingco_state::screen_update_magical(screen_device &screen, bitmap_ind16 & } } - if (m_cm_enable_reg &0x02) - { + if (m_cm_enable_reg & 0x02) m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); - } return 0; } @@ -538,56 +510,56 @@ WRITE8_MEMBER(sanghopm_state::reel3_attrram_w) TILE_GET_INFO_MEMBER(sanghopm_state::get_fg_tile_info) { - int code = m_fg_vidram[tile_index]; - int attr = m_fg_atrram[tile_index]; + int const code = m_fg_vidram[tile_index]; + int const attr = m_fg_atrram[tile_index]; SET_TILE_INFO_MEMBER(0, code | (attr & 0x0f)<<8, - (attr&0x70)>>4, + (attr & 0x70) >> 4, 0); } TILE_GET_INFO_MEMBER(sanghopm_state::get_bg_tile_info) { - int code = m_bg_vidram[tile_index]; - int attr = m_bg_atrram[tile_index]; + int const code = m_bg_vidram[tile_index]; + int const attr = m_bg_atrram[tile_index]; SET_TILE_INFO_MEMBER(1, code | (attr & 0x0f)<<8, - (attr&0x70)>>4, + (attr & 0x70) >> 4, 0); } TILE_GET_INFO_MEMBER(sanghopm_state::get_reel1_tile_info) { - int code = m_reel1_ram[tile_index]; - int attr = m_reel1_attrram[tile_index]; + int const code = m_reel1_ram[tile_index]; + int const attr = m_reel1_attrram[tile_index]; SET_TILE_INFO_MEMBER(1, code | (attr & 0x0f)<<8, - (attr&0x70)>>4, + (attr & 0x70) >> 4, 0); } TILE_GET_INFO_MEMBER(sanghopm_state::get_reel2_tile_info) { - int code = m_reel2_ram[tile_index]; - int attr = m_reel2_attrram[tile_index]; + int const code = m_reel2_ram[tile_index]; + int const attr = m_reel2_attrram[tile_index]; SET_TILE_INFO_MEMBER(1, code | (attr & 0x0f)<<8, - (attr&0x70)>>4, + (attr & 0x70)>>4, 0); } TILE_GET_INFO_MEMBER(sanghopm_state::get_reel3_tile_info) { - int code = m_reel3_ram[tile_index]; - int attr = m_reel3_attrram[tile_index]; + int const code = m_reel3_ram[tile_index]; + int const attr = m_reel3_attrram[tile_index]; SET_TILE_INFO_MEMBER(1, code | (attr & 0x0f)<<8, - (attr&0x70)>>4, + (attr & 0x70)>>4, 0); } @@ -611,26 +583,15 @@ VIDEO_START_MEMBER(sanghopm_state, sangho) UINT32 sanghopm_state::screen_update_sangho(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - int i; - bitmap.fill(m_palette->black_pen(), cliprect); - if (m_enable_reg & 0x01) - { - /* disable reels (only render bg and fg layers) */ - m_bg_tilemap->set_scrolly(0, -16); - m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0); - m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); + m_bg_tilemap->set_scrolly(0, -16); + m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0); - return 0; - } - else + /* enable reels (render all the five layers) */ + if (!(m_enable_reg & 0x01)) { - /* enable reels (render all the five layers) */ - m_bg_tilemap->set_scrolly(0, -16); - m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0); - - for (i= 0;i < 64;i++) + for (int i = 0; i < 64;i++) { m_reel1_tilemap->set_scrolly(i, m_reel1_scroll[i]); m_reel2_tilemap->set_scrolly(i, m_reel2_scroll[i]); @@ -638,17 +599,17 @@ UINT32 sanghopm_state::screen_update_sangho(screen_device &screen, bitmap_ind16 } // are these hardcoded, or registers? - const rectangle visible1(0*8, (15+48)*8-1, 4*8, (4+7)*8-1); - const rectangle visible2(0*8, (15+48)*8-1, 12*8, (12+7)*8-1); - const rectangle visible3(0*8, (15+48)*8-1, 20*8, (20+7)*8-1); + rectangle const visible1(0*8, (15+48)*8-1, 4*8, (4+7)*8-1); + rectangle const visible2(0*8, (15+48)*8-1, 12*8, (12+7)*8-1); + rectangle const visible3(0*8, (15+48)*8-1, 20*8, (20+7)*8-1); m_reel1_tilemap->draw(screen, bitmap, visible1, 0, 0); m_reel2_tilemap->draw(screen, bitmap, visible2, 0, 0); m_reel3_tilemap->draw(screen, bitmap, visible3, 0, 0); - - m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); } + m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); + return 0; } @@ -676,34 +637,34 @@ WRITE8_MEMBER(unkch_state::reel3_attrram_w) TILE_GET_INFO_MEMBER(unkch_state::get_reel1_tile_info) { - int code = m_reel1_ram[tile_index]; - int attr = m_reel1_attrram[tile_index]; + int const code = m_reel1_ram[tile_index]; + int const attr = m_reel1_attrram[tile_index]; SET_TILE_INFO_MEMBER(1, code | (attr & 0x0f)<<8, - (attr&0xf0)>>4, + (attr & 0xf0) >> 4, 0); } TILE_GET_INFO_MEMBER(unkch_state::get_reel2_tile_info) { - int code = m_reel2_ram[tile_index]; - int attr = m_reel2_attrram[tile_index]; + int const code = m_reel2_ram[tile_index]; + int const attr = m_reel2_attrram[tile_index]; SET_TILE_INFO_MEMBER(1, code | (attr & 0x0f)<<8, - (attr&0xf0)>>4, + (attr & 0xf0) >> 4, 0); } TILE_GET_INFO_MEMBER(unkch_state::get_reel3_tile_info) { - int code = m_reel3_ram[tile_index]; - int attr = m_reel3_attrram[tile_index]; + int const code = m_reel3_ram[tile_index]; + int const attr = m_reel3_attrram[tile_index]; SET_TILE_INFO_MEMBER(1, code | (attr & 0x0f)<<8, - (attr&0xf0)>>4, + (attr & 0xf0) >> 4, 0); } @@ -730,20 +691,18 @@ VIDEO_START_MEMBER(unkch_state, unkch) UINT32 unkch_state::screen_update_unkch(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - int i; - bitmap.fill(m_palette->black_pen(), cliprect); - if (!(m_cm_enable_reg &0x01)) + if (!(m_cm_enable_reg & 0x01)) return 0; - if (m_cm_enable_reg &0x08) + if (m_cm_enable_reg & 0x08) { // guess, this could be something else completely!! // only draw the first 'reels' tilemap, but fullscreen, using alt registers? (or no scrolling at all? - doubtful, see girl) if (m_vidreg & 0x40) { - for (i= 0;i < 32;i++) + for (int i = 0; i < 32; i++) { m_reel1_tilemap->set_scrolly(i, -0x08/*m_reel1_scroll[(i*2)+1]*/); // m_reel2_tilemap->set_scrolly(i, m_reel2_scroll[(i*2)+1]); @@ -756,7 +715,7 @@ UINT32 unkch_state::screen_update_unkch(screen_device &screen, bitmap_ind16 &bit // or draw the reels normally? else { - for (i= 0;i < 32;i++) + for (int i= 0; i < 32; i++) { m_reel1_tilemap->set_scrolly(i, m_reel1_scroll[i*2]); m_reel2_tilemap->set_scrolly(i, m_reel2_scroll[i*2]); @@ -773,10 +732,8 @@ UINT32 unkch_state::screen_update_unkch(screen_device &screen, bitmap_ind16 &bit } } - if (m_cm_enable_reg &0x02) - { + if (m_cm_enable_reg & 0x02) m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); - } return 0; } |