From 9cfe9342a7a6c36a05872de985bb63b42f7e870f Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 31 Mar 2021 01:56:32 +1100 Subject: Miscellaneous formatting adjustments --- src/lib/util/cdrom.cpp | 11 ++++++----- src/mame/drivers/bbusters.cpp | 30 +++++++++++++++++------------- src/mame/drivers/mechatt.cpp | 36 +++++++++++++++++++----------------- src/mame/video/snk_bbusters_spr.cpp | 20 ++++++++++---------- src/mame/video/snk_bbusters_spr.h | 14 +++++++------- 5 files changed, 59 insertions(+), 52 deletions(-) diff --git a/src/lib/util/cdrom.cpp b/src/lib/util/cdrom.cpp index cb899afa96b..4f12856dd7f 100644 --- a/src/lib/util/cdrom.cpp +++ b/src/lib/util/cdrom.cpp @@ -16,13 +16,13 @@ ***************************************************************************/ -#include - #include "cdrom.h" -#include #include "chdcd.h" +#include +#include + /*************************************************************************** DEBUGGING @@ -484,7 +484,8 @@ chd_error read_partial_sector(cdrom_file *file, void *dest, uint32_t lbasector, // if a CHD, just read if (file->chd != nullptr) { - if (!phys && file->cdtoc.tracks[tracknum].pgdatasize != 0) { + if (!phys && file->cdtoc.tracks[tracknum].pgdatasize != 0) + { // chdman (phys=true) relies on chdframeofs to point to index 0 instead of index 1 for extractcd. // Actually playing CDs requires it to point to index 1 instead of index 0, so adjust the offset when phys=false. chdsector += file->cdtoc.tracks[tracknum].pregap; @@ -492,7 +493,7 @@ chd_error read_partial_sector(cdrom_file *file, void *dest, uint32_t lbasector, result = file->chd->read_bytes(uint64_t(chdsector) * uint64_t(CD_FRAME_SIZE) + startoffs, dest, length); - /* swap CDDA in the case of LE GDROMs */ + // swap CDDA in the case of LE GDROMs if ((file->cdtoc.flags & CD_FLAG_GDROMLE) && (file->cdtoc.tracks[tracknum].trktype == CD_TRACK_AUDIO)) needswap = true; } diff --git a/src/mame/drivers/bbusters.cpp b/src/mame/drivers/bbusters.cpp index c6ed0e40d12..d3d655de8f9 100644 --- a/src/mame/drivers/bbusters.cpp +++ b/src/mame/drivers/bbusters.cpp @@ -116,6 +116,8 @@ #include "speaker.h" #include "tilemap.h" +namespace { + class bbusters_state : public driver_device { public: @@ -161,7 +163,7 @@ private: tilemap_t *m_pf_tilemap[2]; TILE_GET_INFO_MEMBER(get_tile_info); - template TILE_GET_INFO_MEMBER(get_pf_tile_info); + template TILE_GET_INFO_MEMBER(get_pf_tile_info); void sound_cpu_w(uint8_t data); void video_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); @@ -196,10 +198,10 @@ void bbusters_state::sound_cpu_w(uint8_t data) m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); } -/* Eprom is byte wide, top half of word _must_ be 0xff */ +// EPROM is byte wide, top half of word _must_ be 0xff uint16_t bbusters_state::eprom_r(offs_t offset) { - return (m_eprom_data[offset]&0xff) | 0xff00; + return (m_eprom_data[offset] & 0xff) | 0xff00; } void bbusters_state::three_gun_output_w(uint16_t data) @@ -208,7 +210,7 @@ void bbusters_state::three_gun_output_w(uint16_t data) m_gun_recoil[i] = BIT(data, i); } -template +template void bbusters_state::pf_w(offs_t offset, uint16_t data, uint16_t mem_mask) { COMBINE_DATA(&m_pf_data[Layer][offset]); @@ -226,15 +228,15 @@ TILE_GET_INFO_MEMBER(bbusters_state::get_tile_info) { uint16_t tile = m_tx_videoram[tile_index]; - tileinfo.set(0,tile&0xfff,tile>>12,0); + tileinfo.set(0, tile&0xfff, tile>>12, 0); } -template +template TILE_GET_INFO_MEMBER(bbusters_state::get_pf_tile_info) { uint16_t tile = m_pf_data[Layer][tile_index]; - tileinfo.set(Gfx,tile&0xfff,tile>>12,0); + tileinfo.set(Gfx, tile&0xfff, tile>>12, 0); } void bbusters_state::video_w(offs_t offset, uint16_t data, uint16_t mem_mask) @@ -273,8 +275,8 @@ void bbusters_state::mix_sprites(bitmap_ind16 &bitmap, bitmap_ind16 &srcbitmap, { for (int y = cliprect.min_y; y <= cliprect.max_y; y++) { - uint16_t* srcbuf = &srcbitmap.pix(y); - uint16_t* dstbuf = &bitmap.pix(y); + uint16_t *srcbuf = &srcbitmap.pix(y); + uint16_t *dstbuf = &bitmap.pix(y); for (int x = cliprect.min_x; x <= cliprect.max_x; x++) { uint16_t srcdat = srcbuf[x]; @@ -299,10 +301,10 @@ uint32_t bbusters_state::screen_update(screen_device &screen, bitmap_ind16 &bitm m_pf_tilemap[1]->draw(screen, bitmap, cliprect, 0, 0); // Palettes 0xc-0xf confirmed to be behind tilemap on Beast Busters for 2nd sprite chip (elevator stage) - mix_sprites(bitmap, m_bitmap_sprites[1], cliprect, [](uint16_t srcdat, uint16_t x, uint16_t* dstbuf) { if ((srcdat & 0xc0) == 0xc0) dstbuf[x] = srcdat + 512; } ); + mix_sprites(bitmap, m_bitmap_sprites[1], cliprect, [](uint16_t srcdat, uint16_t x, uint16_t *dstbuf) { if ((srcdat & 0xc0) == 0xc0) dstbuf[x] = srcdat + 512; } ); m_pf_tilemap[0]->draw(screen, bitmap, cliprect, 0, 2); - mix_sprites(bitmap, m_bitmap_sprites[1], cliprect, [](uint16_t srcdat, uint16_t x, uint16_t* dstbuf) { if ((srcdat & 0xc0) != 0xc0) dstbuf[x] = srcdat + 512; } ); - mix_sprites(bitmap, m_bitmap_sprites[0], cliprect, [](uint16_t srcdat, uint16_t x, uint16_t* dstbuf) { dstbuf[x] = srcdat + 256; } ); + mix_sprites(bitmap, m_bitmap_sprites[1], cliprect, [](uint16_t srcdat, uint16_t x, uint16_t *dstbuf) { if ((srcdat & 0xc0) != 0xc0) dstbuf[x] = srcdat + 512; } ); + mix_sprites(bitmap, m_bitmap_sprites[0], cliprect, [](uint16_t srcdat, uint16_t x, uint16_t *dstbuf) { dstbuf[x] = srcdat + 256; } ); m_fix_tilemap->draw(screen, bitmap, cliprect, 0, 0); @@ -499,7 +501,7 @@ void bbusters_state::bbusters(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &bbusters_state::bbusters_map); m_maincpu->set_vblank_int("screen", FUNC(bbusters_state::irq6_line_hold)); - Z80(config, m_audiocpu, 4000000); /* Accurate */ + Z80(config, m_audiocpu, 4000000); // Accurate m_audiocpu->set_addrmap(AS_PROGRAM, &bbusters_state::sound_map); m_audiocpu->set_addrmap(AS_IO, &bbusters_state::sound_portmap); @@ -787,6 +789,8 @@ ROM_START( bbustersja ) ROM_LOAD( "bb-pcmb.l3", 0x000000, 0x80000, CRC(c8d5dd53) SHA1(0f7e94532cc14852ca12c1b792e5479667af899e) ) ROM_END +} // anonymous namespace + /******************************************************************************/ GAME( 1989, bbusters, 0, bbusters, bbusters, bbusters_state, empty_init, ROT0, "SNK", "Beast Busters (World)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/mechatt.cpp b/src/mame/drivers/mechatt.cpp index d046cd03ed4..260248dd5ef 100644 --- a/src/mame/drivers/mechatt.cpp +++ b/src/mame/drivers/mechatt.cpp @@ -5,8 +5,8 @@ Mechanized Attack A8002 (c) 1989 SNK Corporation Compared to Beast Busters (A9003), Mechanized Attack (A8002) is an - earlier design, it only has one sprite chip, no eeprom, and only 2 - machine guns, but the tilemaps are twice the size. + earlier design, it only has one sprite chip, no eeprom, and only 2 + machine guns, but the tilemaps are twice the size. ---------------------------------------------------------------------------------------- @@ -145,6 +145,8 @@ #include "speaker.h" #include "tilemap.h" +namespace { + class mechatt_state : public driver_device { public: @@ -188,7 +190,7 @@ private: tilemap_t *m_pf_tilemap[2]; TILE_GET_INFO_MEMBER(get_tile_info); - template TILE_GET_INFO_MEMBER(get_pf_tile_info); + template TILE_GET_INFO_MEMBER(get_pf_tile_info); void sound_cpu_w(uint8_t data); void video_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); @@ -239,14 +241,14 @@ void mechatt_state::coin_counter_w(uint8_t data) TILE_GET_INFO_MEMBER(mechatt_state::get_tile_info) { uint16_t tile = m_tx_videoram[tile_index]; - tileinfo.set(0,tile&0xfff,tile>>12,0); + tileinfo.set(0, tile&0xfff, tile>>12, 0); } -template +template TILE_GET_INFO_MEMBER(mechatt_state::get_pf_tile_info) { uint16_t tile = m_pf_data[Layer][tile_index]; - tileinfo.set(Gfx,tile&0xfff,tile>>12,0); + tileinfo.set(Gfx, tile&0xfff, tile>>12, 0); } void mechatt_state::video_w(offs_t offset, uint16_t data, uint16_t mem_mask) @@ -262,8 +264,8 @@ void mechatt_state::video_start() m_fix_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(mechatt_state::get_tile_info)), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fix_tilemap->set_transparent_pen(15); - m_pf_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, NAME((&mechatt_state::get_pf_tile_info<0,1>))), TILEMAP_SCAN_COLS, 16, 16, 256, 32); - m_pf_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, NAME((&mechatt_state::get_pf_tile_info<1,2>))), TILEMAP_SCAN_COLS, 16, 16, 256, 32); + m_pf_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, NAME((&mechatt_state::get_pf_tile_info<0, 1>))), TILEMAP_SCAN_COLS, 16, 16, 256, 32); + m_pf_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, NAME((&mechatt_state::get_pf_tile_info<1, 2>))), TILEMAP_SCAN_COLS, 16, 16, 256, 32); m_pf_tilemap[0]->set_transparent_pen(15); @@ -276,8 +278,8 @@ void mechatt_state::mix_sprites(bitmap_ind16 &bitmap, bitmap_ind16 &srcbitmap, c { for (int y = cliprect.min_y; y <= cliprect.max_y; y++) { - uint16_t* srcbuf = &srcbitmap.pix(y); - uint16_t* dstbuf = &bitmap.pix(y); + uint16_t *srcbuf = &srcbitmap.pix(y); + uint16_t *dstbuf = &bitmap.pix(y); for (int x = cliprect.min_x; x <= cliprect.max_x; x++) { uint16_t srcdat = srcbuf[x]; @@ -318,17 +320,15 @@ void mechatt_state::two_gun_output_w(uint16_t data) uint16_t mechatt_state::mechatt_gun_r(offs_t offset) { - int x, y; - - x = m_gun_io[offset ? 2 : 0]->read(); - y = m_gun_io[offset ? 3 : 1]->read(); + int x = m_gun_io[offset ? 2 : 0]->read(); + int y = m_gun_io[offset ? 3 : 1]->read(); - /* Todo - does the hardware really clamp like this? */ + // TODO - does the hardware really clamp like this? x += 0x18; if (x > 0xff) x = 0xff; if (y > 0xef) y = 0xef; - return x | (y<<8); + return x | (y << 8); } void mechatt_state::mechatt_map(address_map &map) @@ -364,7 +364,7 @@ void mechatt_state::sounda_portmap(address_map &map) { map.global_mask(0xff); map(0x00, 0x03).rw("ymsnd", FUNC(ym2608_device::read), FUNC(ym2608_device::write)); - map(0xc0, 0xc1).nopw(); /* -> Main CPU */ + map(0xc0, 0xc1).nopw(); // -> Main CPU } /******************************************************************************/ @@ -722,6 +722,8 @@ ROM_START( mechattu1 ) // Uses EPROMs on official SNK A8002-5 & A8002-6 sub boar ROM_LOAD( "ma_9.f12", 0x000000, 0x10000, CRC(61f3de03) SHA1(736f9634fe054ea68a2aa90a743bd0dc320f23c9) ) // identical to ma_8.f10 ROM_END +} // anonymous namespace + /******************************************************************************/ diff --git a/src/mame/video/snk_bbusters_spr.cpp b/src/mame/video/snk_bbusters_spr.cpp index abd94cc51f9..1dc4ca27e72 100644 --- a/src/mame/video/snk_bbusters_spr.cpp +++ b/src/mame/video/snk_bbusters_spr.cpp @@ -55,15 +55,15 @@ void snk_bbusters_spr_device::device_start() save_item(NAME(m_scale_line_count)); } -template -int snk_bbusters_spr_device::adjust_spritecode(int dx, int dy, int code) +template +inline int snk_bbusters_spr_device::adjust_spritecode(int dx, int dy, int code) { if (dy & (0x10 << Size)) code += 2 << (Size * 2); if (dx & (0x10 << Size)) code += 1 << (Size * 2); return code; } -inline const uint8_t* snk_bbusters_spr_device::get_source_ptr(gfx_element* tilegfx, uint32_t sprite, int dx, int dy, int block) +inline const uint8_t *snk_bbusters_spr_device::get_source_ptr(gfx_element *tilegfx, uint32_t sprite, int dx, int dy, int block) { int code = 0; @@ -105,7 +105,7 @@ void snk_bbusters_spr_device::draw_block(bitmap_ind16 &dest, const rectangle &cl { // TODO: respect cliprect - gfx_element* tilegfx = gfx(0); + gfx_element *tilegfx = gfx(0); pen_t pen_base = tilegfx->colorbase() + tilegfx->granularity() * (color % tilegfx->colors()); uint32_t xinc = (m_scale_line_count * 0x10000) / size; int dy = y; @@ -115,9 +115,9 @@ void snk_bbusters_spr_device::draw_block(bitmap_ind16 &dest, const rectangle &cl { if (dy >= 16 && dy < 240) { - uint16_t* const destline = &dest.pix(dy); + uint16_t *const destline = &dest.pix(dy); uint8_t srcline = *m_scale_table_ptr; - const uint8_t* srcptr = nullptr; + const uint8_t *srcptr = nullptr; if (!flipy) srcline = size - srcline - 1; @@ -150,9 +150,9 @@ void snk_bbusters_spr_device::draw_block(bitmap_ind16 &dest, const rectangle &cl } } -void snk_bbusters_spr_device::draw_sprites(bitmap_ind16& bitmap, const rectangle& cliprect) +void snk_bbusters_spr_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) { - const uint16_t* sprram = m_spriteram->buffer(); + const uint16_t *sprram = m_spriteram->buffer(); for (int offs = 0; offs < 0x800; offs += 4) { @@ -184,11 +184,11 @@ void snk_bbusters_spr_device::draw_sprites(bitmap_ind16& bitmap, const rectangle Block type 3: 0x00 = no scale, 0x3f == half size - 128 pixel sprite */ - colour = colour >> 12; + colour >>= 12; int block = (sprram[offs + 0] >> 8) & 0x3; int fy = sprram[offs + 0] & 0x400; int fx = sprram[offs + 0] & 0x800; - sprite = sprite & 0x3fff; + sprite &= 0x3fff; int scale; switch ((sprram[offs + 0] >> 8) & 0x3) diff --git a/src/mame/video/snk_bbusters_spr.h b/src/mame/video/snk_bbusters_spr.h index c451040b11f..f13a2aff66c 100644 --- a/src/mame/video/snk_bbusters_spr.h +++ b/src/mame/video/snk_bbusters_spr.h @@ -3,6 +3,7 @@ #ifndef MAME_VIDEO_SNK_BBUSTERS_SPR_H #define MAME_VIDEO_SNK_BBUSTERS_SPR_H +#pragma once #include "video/bufsprite.h" @@ -21,17 +22,16 @@ protected: virtual void device_start() override; private: - DECLARE_GFXDECODE_MEMBER(gfxinfo); - const uint8_t *m_scale_table_ptr; - uint8_t m_scale_line_count; + const uint8_t *get_source_ptr(gfx_element *tilegfx, uint32_t sprite, int dx, int dy, int block); + void draw_block(bitmap_ind16 &dest, const rectangle &cliprect, int x, int y, int size, int flipx, int flipy, uint32_t sprite, int color, int block); - template - int adjust_spritecode(int dx, int dy, int code); + template + static int adjust_spritecode(int dx, int dy, int code); - const uint8_t *get_source_ptr(gfx_element *tilegfx, uint32_t sprite, int dx, int dy, int block); - void draw_block(bitmap_ind16 &dest, const rectangle &cliprect, int x,int y,int size,int flipx,int flipy,uint32_t sprite,int color,int block); + const uint8_t *m_scale_table_ptr; + uint8_t m_scale_line_count; required_region_ptr m_scale_table; required_device m_spriteram; -- cgit v1.2.3