summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/cybertnk.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/cybertnk.cpp')
-rw-r--r--src/mame/drivers/cybertnk.cpp50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/mame/drivers/cybertnk.cpp b/src/mame/drivers/cybertnk.cpp
index 2f409ff1665..aaa7d82eddc 100644
--- a/src/mame/drivers/cybertnk.cpp
+++ b/src/mame/drivers/cybertnk.cpp
@@ -202,14 +202,14 @@ public:
required_device<palette_device> m_palette;
required_device<generic_latch_8_device> m_soundlatch;
- required_shared_ptr<UINT16> m_spr_ram;
- required_shared_ptr<UINT16> m_tilemap0_vram;
- required_shared_ptr<UINT16> m_tilemap1_vram;
- required_shared_ptr<UINT16> m_tilemap2_vram;
- required_shared_ptr<UINT16> m_tilemap0scroll;
- required_shared_ptr<UINT16> m_tilemap1scroll;
- required_shared_ptr<UINT16> m_tilemap2scroll;
- required_shared_ptr<UINT16> m_roadram;
+ required_shared_ptr<uint16_t> m_spr_ram;
+ required_shared_ptr<uint16_t> m_tilemap0_vram;
+ required_shared_ptr<uint16_t> m_tilemap1_vram;
+ required_shared_ptr<uint16_t> m_tilemap2_vram;
+ required_shared_ptr<uint16_t> m_tilemap0scroll;
+ required_shared_ptr<uint16_t> m_tilemap1scroll;
+ required_shared_ptr<uint16_t> m_tilemap2scroll;
+ required_shared_ptr<uint16_t> m_roadram;
tilemap_t *m_tilemap0_tilemap;
tilemap_t *m_tilemap1_tilemap;
@@ -219,7 +219,7 @@ public:
DECLARE_WRITE16_MEMBER(tilemap1_vram_w);
DECLARE_WRITE16_MEMBER(tilemap2_vram_w);
- UINT8 m_mux_data;
+ uint8_t m_mux_data;
DECLARE_WRITE8_MEMBER(cybertnk_sound_cmd_w);
DECLARE_WRITE8_MEMBER(cybertnk_mux_w);
DECLARE_READ8_MEMBER(cybertnk_io_rdy_r);
@@ -233,9 +233,9 @@ public:
virtual void video_start() override;
void draw_road(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int screen_shift, int pri);
void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int screen_shift);
- UINT32 update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int screen_shift);
- UINT32 screen_update_cybertnk_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- UINT32 screen_update_cybertnk_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int screen_shift);
+ uint32_t screen_update_cybertnk_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_cybertnk_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
/* tile format
@@ -306,9 +306,9 @@ void cybertnk_state::draw_road(screen_device &screen, bitmap_ind16 &bitmap, cons
for (int i = 0; i < 0x1000/4; i+=4)
{
- UINT16 param1 = m_roadram[i+2];
- UINT16 param2 = m_roadram[i+1];
- UINT16 param3 = m_roadram[i+0];
+ uint16_t param1 = m_roadram[i+2];
+ uint16_t param2 = m_roadram[i+1];
+ uint16_t param3 = m_roadram[i+0];
int col = (param2 & 0x3f);
@@ -325,14 +325,14 @@ void cybertnk_state::draw_road(screen_device &screen, bitmap_ind16 &bitmap, cons
// check if these are similar / the same as weclemans
void cybertnk_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int screen_shift)
{
- const UINT32 *sprrom = (UINT32*)memregion("spr_gfx")->base();
+ const uint32_t *sprrom = (uint32_t*)memregion("spr_gfx")->base();
const pen_t *paldata = m_palette->pens();
int miny = cliprect.min_y;
int maxy = cliprect.max_y;
int minx = cliprect.min_x;
int maxx = cliprect.max_x;
- UINT16* dest;
+ uint16_t* dest;
/*
@@ -368,7 +368,7 @@ void cybertnk_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, c
if (y&0x100) y-=0x200;
- UINT32 spr_offs = (((m_spr_ram[offs+0x0] & 7) << 16) | (m_spr_ram[offs+0x1]));
+ uint32_t spr_offs = (((m_spr_ram[offs+0x0] & 7) << 16) | (m_spr_ram[offs+0x1]));
int xsize = ((m_spr_ram[offs+0x6] & 0x000f)+1) << 3;
int ysize = (m_spr_ram[offs+0x4] & 0x00ff)+1;
int fx = (m_spr_ram[offs+0x5] & 0x8000) >> 15;
@@ -410,11 +410,11 @@ void cybertnk_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, c
for(int xi=start;xi != end;xi+=inc)
{ // start x loop
- UINT32 color;
+ uint32_t color;
color = sprrom[spr_offs+xi/8];
- UINT16 dot;
+ uint16_t dot;
int x_dec; //helpers
int shift_pen = 0;
@@ -475,7 +475,7 @@ void cybertnk_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, c
}
-UINT32 cybertnk_state::update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int screen_shift)
+uint32_t cybertnk_state::update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int screen_shift)
{
m_tilemap0_tilemap->set_scrolldx(screen_shift, screen_shift);
m_tilemap1_tilemap->set_scrolldx(screen_shift, screen_shift);
@@ -507,8 +507,8 @@ UINT32 cybertnk_state::update_screen(screen_device &screen, bitmap_ind16 &bitmap
return 0;
}
-UINT32 cybertnk_state::screen_update_cybertnk_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ return update_screen(screen, bitmap, cliprect, 0); }
-UINT32 cybertnk_state::screen_update_cybertnk_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ return update_screen(screen, bitmap, cliprect, -256); }
+uint32_t cybertnk_state::screen_update_cybertnk_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ return update_screen(screen, bitmap, cliprect, 0); }
+uint32_t cybertnk_state::screen_update_cybertnk_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ return update_screen(screen, bitmap, cliprect, -256); }
WRITE16_MEMBER(cybertnk_state::tilemap0_vram_w)
@@ -797,7 +797,7 @@ static const gfx_layout tile_8x8x4 =
8*8
};
-static const UINT32 xoffsets[] = { STEP1024(0,4) };
+static const uint32_t xoffsets[] = { STEP1024(0,4) };
static const gfx_layout roadlayout =
{
1024,1,
@@ -973,7 +973,7 @@ ROM_END
DRIVER_INIT_MEMBER(cybertnk_state,cybertnk)
{
- UINT32 *spr = (UINT32*)memregion("spr_gfx")->base();
+ uint32_t *spr = (uint32_t*)memregion("spr_gfx")->base();
for (int x = 0; x< 0x200000/4;x++)
{