summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2015-03-09 19:41:37 +1100
committer Vas Crabb <vas@vastheman.com>2015-03-09 19:41:37 +1100
commit5c23ae718a7634a94da68cd5020ec386d77ec6ac (patch)
tree8902d364ceb92da8cec813ddad104cc56fbf5df2
parentc7c26571c2db0e681ff0fe022b004169dd2d0a54 (diff)
Fix class name conflict
-rw-r--r--src/mame/drivers/goldstar.c16
-rw-r--r--src/mame/includes/goldstar.h4
-rw-r--r--src/mame/video/goldstar.c38
3 files changed, 29 insertions, 29 deletions
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index 0dc8d69ec74..608a5a91a17 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -257,7 +257,7 @@ static ADDRESS_MAP_START( goldstar_readport, AS_IO, 8, goldstar_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( star100_map, AS_PROGRAM, 8, sangho_state )
+static ADDRESS_MAP_START( star100_map, AS_PROGRAM, 8, sanghopm_state )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(fg_vidram_w) AM_SHARE("fg_vidram") // videoram 1
@@ -290,7 +290,7 @@ static ADDRESS_MAP_START( star100_map, AS_PROGRAM, 8, sangho_state )
ADDRESS_MAP_END
-WRITE8_MEMBER(sangho_state::coincount_w)
+WRITE8_MEMBER(sanghopm_state::coincount_w)
{
/*
7654 3210
@@ -309,12 +309,12 @@ WRITE8_MEMBER(sangho_state::coincount_w)
coin_counter_w(machine(), 4, data & 0x01); /* counter5 payout */
}
-WRITE8_MEMBER(sangho_state::enable_w)
+WRITE8_MEMBER(sanghopm_state::enable_w)
{
m_enable_reg = data;
}
-static ADDRESS_MAP_START( star100_readport, AS_IO, 8, sangho_state )
+static ADDRESS_MAP_START( star100_readport, AS_IO, 8, sanghopm_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x08, 0x08) AM_DEVREADWRITE("aysnd", ay8910_device, data_r, data_w)
@@ -7589,13 +7589,13 @@ static MACHINE_CONFIG_START( goldstbl, goldstar_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( star100, sangho_state )
+static MACHINE_CONFIG_START( star100, sanghopm_state )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(star100_map)
MCFG_CPU_IO_MAP(star100_readport)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sangho_state, irq0_line_hold)
+ MCFG_CPU_VBLANK_INT_DRIVER("screen", sanghopm_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -7603,7 +7603,7 @@ static MACHINE_CONFIG_START( star100, sangho_state )
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
- MCFG_SCREEN_UPDATE_DRIVER(sangho_state, screen_update_sangho)
+ MCFG_SCREEN_UPDATE_DRIVER(sanghopm_state, screen_update_sangho)
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 0x100)
@@ -7613,7 +7613,7 @@ static MACHINE_CONFIG_START( star100, sangho_state )
MCFG_NVRAM_ADD_1FILL("nvram")
- MCFG_VIDEO_START_OVERRIDE(sangho_state, sangho)
+ MCFG_VIDEO_START_OVERRIDE(sanghopm_state, sangho)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h
index 9e5139344f7..edf1381d850 100644
--- a/src/mame/includes/goldstar.h
+++ b/src/mame/includes/goldstar.h
@@ -217,10 +217,10 @@ protected:
};
-class sangho_state : public goldstar_state
+class sanghopm_state : public goldstar_state
{
public:
- sangho_state(const machine_config &mconfig, device_type type, const char *tag) :
+ sanghopm_state(const machine_config &mconfig, device_type type, const char *tag) :
goldstar_state(mconfig, type, tag),
m_reel1_attrram(*this, "reel1_attrram"),
m_reel2_attrram(*this, "reel2_attrram"),
diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c
index 240cac74cf9..4fd63f5a166 100644
--- a/src/mame/video/goldstar.c
+++ b/src/mame/video/goldstar.c
@@ -493,50 +493,50 @@ UINT32 wingco_state::screen_update_magical(screen_device &screen, bitmap_ind16 &
-WRITE8_MEMBER(sangho_state::fg_vidram_w)
+WRITE8_MEMBER(sanghopm_state::fg_vidram_w)
{
m_fg_vidram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(sangho_state::fg_atrram_w)
+WRITE8_MEMBER(sanghopm_state::fg_atrram_w)
{
m_fg_atrram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(sangho_state::bg_vidram_w)
+WRITE8_MEMBER(sanghopm_state::bg_vidram_w)
{
m_bg_vidram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(sangho_state::bg_atrram_w)
+WRITE8_MEMBER(sanghopm_state::bg_atrram_w)
{
m_bg_atrram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(sangho_state::reel1_attrram_w)
+WRITE8_MEMBER(sanghopm_state::reel1_attrram_w)
{
m_reel1_attrram[offset] = data;
m_reel1_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(sangho_state::reel2_attrram_w)
+WRITE8_MEMBER(sanghopm_state::reel2_attrram_w)
{
m_reel2_attrram[offset] = data;
m_reel2_tilemap->mark_tile_dirty(offset);
}
-WRITE8_MEMBER(sangho_state::reel3_attrram_w)
+WRITE8_MEMBER(sanghopm_state::reel3_attrram_w)
{
m_reel3_attrram[offset] = data;
m_reel3_tilemap->mark_tile_dirty(offset);
}
-TILE_GET_INFO_MEMBER(sangho_state::get_fg_tile_info)
+TILE_GET_INFO_MEMBER(sanghopm_state::get_fg_tile_info)
{
int code = m_fg_vidram[tile_index];
int attr = m_fg_atrram[tile_index];
@@ -547,7 +547,7 @@ TILE_GET_INFO_MEMBER(sangho_state::get_fg_tile_info)
0);
}
-TILE_GET_INFO_MEMBER(sangho_state::get_bg_tile_info)
+TILE_GET_INFO_MEMBER(sanghopm_state::get_bg_tile_info)
{
int code = m_bg_vidram[tile_index];
int attr = m_bg_atrram[tile_index];
@@ -558,7 +558,7 @@ TILE_GET_INFO_MEMBER(sangho_state::get_bg_tile_info)
0);
}
-TILE_GET_INFO_MEMBER(sangho_state::get_reel1_tile_info)
+TILE_GET_INFO_MEMBER(sanghopm_state::get_reel1_tile_info)
{
int code = m_reel1_ram[tile_index];
int attr = m_reel1_attrram[tile_index];
@@ -569,7 +569,7 @@ TILE_GET_INFO_MEMBER(sangho_state::get_reel1_tile_info)
0);
}
-TILE_GET_INFO_MEMBER(sangho_state::get_reel2_tile_info)
+TILE_GET_INFO_MEMBER(sanghopm_state::get_reel2_tile_info)
{
int code = m_reel2_ram[tile_index];
int attr = m_reel2_attrram[tile_index];
@@ -580,7 +580,7 @@ TILE_GET_INFO_MEMBER(sangho_state::get_reel2_tile_info)
0);
}
-TILE_GET_INFO_MEMBER(sangho_state::get_reel3_tile_info)
+TILE_GET_INFO_MEMBER(sanghopm_state::get_reel3_tile_info)
{
int code = m_reel3_ram[tile_index];
int attr = m_reel3_attrram[tile_index];
@@ -592,24 +592,24 @@ TILE_GET_INFO_MEMBER(sangho_state::get_reel3_tile_info)
}
-VIDEO_START_MEMBER(sangho_state, sangho)
+VIDEO_START_MEMBER(sanghopm_state, sangho)
{
- m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sangho_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8);
+ m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sanghopm_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 8, 32, 64, 8);
- m_reel1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sangho_state::get_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8);
- m_reel2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sangho_state::get_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8);
- m_reel3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sangho_state::get_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8);
+ m_reel1_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sanghopm_state::get_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8);
+ m_reel2_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sanghopm_state::get_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8);
+ m_reel3_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sanghopm_state::get_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8);
m_reel1_tilemap->set_scroll_cols(64);
m_reel2_tilemap->set_scroll_cols(64);
m_reel3_tilemap->set_scroll_cols(64);
- m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sangho_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 64, 32);
+ m_fg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sanghopm_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 64, 32);
m_fg_tilemap->set_transparent_pen(0);
}
-UINT32 sangho_state::screen_update_sangho(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+UINT32 sanghopm_state::screen_update_sangho(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
int i;