summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2017-04-11 23:40:30 -0400
committer AJR <ajrhacker@users.noreply.github.com>2017-04-11 23:40:30 -0400
commit18bf62d621f5be946cdfca98d5a4ca9344d5e1c2 (patch)
treefbf686f6df386a18d3088b62764a0aaaf396f3c8
parentb447121b72b4d21d58fda622924cc0ae10e15f60 (diff)
Move "optional" basemem and extmem arrays out of tilemap_t (nw)
This is intended as a first step towards divorcing tilemap_t and tilemap_device.
-rw-r--r--src/emu/tilemap.h26
-rw-r--r--src/mame/drivers/cyberbal.cpp4
-rw-r--r--src/mame/includes/cyberbal.h2
-rw-r--r--src/mame/video/atarig1.cpp4
-rw-r--r--src/mame/video/atarig42.cpp4
-rw-r--r--src/mame/video/atarigt.cpp4
-rw-r--r--src/mame/video/atarigx2.cpp4
-rw-r--r--src/mame/video/atarisy1.cpp4
-rw-r--r--src/mame/video/atarisy2.cpp4
-rw-r--r--src/mame/video/badlands.cpp2
-rw-r--r--src/mame/video/batman.cpp10
-rw-r--r--src/mame/video/blstroid.cpp2
-rw-r--r--src/mame/video/cyberbal.cpp23
-rw-r--r--src/mame/video/eprom.cpp10
-rw-r--r--src/mame/video/foodf.cpp2
-rw-r--r--src/mame/video/gauntlet.cpp4
-rw-r--r--src/mame/video/klax.cpp4
-rw-r--r--src/mame/video/offtwall.cpp4
-rw-r--r--src/mame/video/relief.cpp8
-rw-r--r--src/mame/video/shuuz.cpp4
-rw-r--r--src/mame/video/skullxbo.cpp6
-rw-r--r--src/mame/video/thunderj.cpp10
-rw-r--r--src/mame/video/toobin.cpp4
-rw-r--r--src/mame/video/vindictr.cpp4
-rw-r--r--src/mame/video/xybots.cpp4
25 files changed, 90 insertions, 67 deletions
diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h
index f4261c209d1..83afd4051c2 100644
--- a/src/emu/tilemap.h
+++ b/src/emu/tilemap.h
@@ -507,8 +507,6 @@ public:
tilemap_t *next() const { return m_next; }
void *user_data() const { return m_user_data; }
- memory_array &basemem() { return m_basemem; }
- memory_array &extmem() { return m_extmem; }
u32 rows() const { return m_rows; }
u32 cols() const { return m_cols; }
u16 tilewidth() const { return m_tilewidth; }
@@ -573,12 +571,6 @@ public:
tilemap_memory_index scan_cols_flip_y(u32 col, u32 row, u32 num_cols, u32 num_rows);
tilemap_memory_index scan_cols_flip_xy(u32 col, u32 row, u32 num_cols, u32 num_rows);
- // optional memory accessors
- u32 basemem_read(int index) { return m_basemem.read(index); }
- u32 extmem_read(int index) { return m_extmem.read(index); }
- void basemem_write(int index, u32 data) { m_basemem.write(index, data); mark_tile_dirty(index); }
- void extmem_write(int index, u32 data) { m_extmem.write(index, data); mark_tile_dirty(index); }
-
private:
// internal set of transparency states for rendering
enum trans_t
@@ -638,10 +630,6 @@ private:
tilemap_t * m_next; // pointer to next tilemap
void * m_user_data; // user data value
- // optional memory info
- memory_array m_basemem; // info about base memory
- memory_array m_extmem; // info about extension memory
-
// basic tilemap metrics
u32 m_rows; // number of tile rows
u32 m_cols; // number of tile columns
@@ -747,6 +735,10 @@ public:
static void static_set_tile_size(device_t &device, u16 width, u16 height);
static void static_set_transparent_pen(device_t &device, pen_t pen);
+ // getters
+ memory_array &basemem() { return m_basemem; }
+ memory_array &extmem() { return m_extmem; }
+
// write handlers
DECLARE_WRITE8_MEMBER(write);
DECLARE_WRITE16_MEMBER(write);
@@ -755,6 +747,12 @@ public:
DECLARE_WRITE16_MEMBER(write_ext);
DECLARE_WRITE32_MEMBER(write_ext);
+ // optional memory accessors
+ u32 basemem_read(int index) { return m_basemem.read(index); }
+ u32 extmem_read(int index) { return m_extmem.read(index); }
+ void basemem_write(int index, u32 data) { m_basemem.write(index, data); mark_tile_dirty(index); }
+ void extmem_write(int index, u32 data) { m_extmem.write(index, data); mark_tile_dirty(index); }
+
// pick one to use to avoid ambiguity errors
using device_t::machine;
@@ -777,6 +775,10 @@ private:
u32 m_num_rows;
bool m_transparent_pen_set;
pen_t m_transparent_pen;
+
+ // optional memory info
+ memory_array m_basemem; // info about base memory
+ memory_array m_extmem; // info about extension memory
};
diff --git a/src/mame/drivers/cyberbal.cpp b/src/mame/drivers/cyberbal.cpp
index 6d5ce2752f3..8780d701976 100644
--- a/src/mame/drivers/cyberbal.cpp
+++ b/src/mame/drivers/cyberbal.cpp
@@ -435,8 +435,8 @@ static MACHINE_CONFIG_START( cyberbal, cyberbal_state )
MCFG_ATARI_MOTION_OBJECTS_ADD("mob", "lscreen", cyberbal_state::s_mob_config)
MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode")
- MCFG_TILEMAP_ADD_STANDARD("playfield2", "gfxdecode", 2, cyberbal_state, get_playfield_tile_info, 16,8, SCAN_ROWS, 64,64)
- MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha2", "gfxdecode", 2, cyberbal_state, get_alpha_tile_info, 16,8, SCAN_ROWS, 64,32, 0)
+ MCFG_TILEMAP_ADD_STANDARD("playfield2", "gfxdecode", 2, cyberbal_state, get_playfield2_tile_info, 16,8, SCAN_ROWS, 64,64)
+ MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha2", "gfxdecode", 2, cyberbal_state, get_alpha2_tile_info, 16,8, SCAN_ROWS, 64,32, 0)
MCFG_ATARI_MOTION_OBJECTS_ADD("mob2", "rscreen", cyberbal_state::s_mob_config)
MCFG_ATARI_MOTION_OBJECTS_GFXDECODE("gfxdecode")
diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h
index d02c60ae628..1659118305a 100644
--- a/src/mame/includes/cyberbal.h
+++ b/src/mame/includes/cyberbal.h
@@ -79,7 +79,9 @@ public:
DECLARE_WRITE16_MEMBER(sound_68k_dac_w);
DECLARE_DRIVER_INIT(cyberbalt);
TILE_GET_INFO_MEMBER(get_alpha_tile_info);
+ TILE_GET_INFO_MEMBER(get_alpha2_tile_info);
TILE_GET_INFO_MEMBER(get_playfield_tile_info);
+ TILE_GET_INFO_MEMBER(get_playfield2_tile_info);
DECLARE_MACHINE_START(cyberbal);
DECLARE_MACHINE_START(cyberbal2p);
DECLARE_MACHINE_RESET(cyberbal);
diff --git a/src/mame/video/atarig1.cpp b/src/mame/video/atarig1.cpp
index aa27f34827e..7f769a77a4e 100644
--- a/src/mame/video/atarig1.cpp
+++ b/src/mame/video/atarig1.cpp
@@ -20,7 +20,7 @@
TILE_GET_INFO_MEMBER(atarig1_state::get_alpha_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_alpha_tilemap->basemem_read(tile_index);
int code = data & 0xfff;
int color = (data >> 12) & 0x0f;
int opaque = data & 0x8000;
@@ -30,7 +30,7 @@ TILE_GET_INFO_MEMBER(atarig1_state::get_alpha_tile_info)
TILE_GET_INFO_MEMBER(atarig1_state::get_playfield_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = (m_playfield_tile_bank << 12) | (data & 0xfff);
int color = (data >> 12) & 7;
SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1);
diff --git a/src/mame/video/atarig42.cpp b/src/mame/video/atarig42.cpp
index d38d7034927..b553cc0f512 100644
--- a/src/mame/video/atarig42.cpp
+++ b/src/mame/video/atarig42.cpp
@@ -35,7 +35,7 @@
TILE_GET_INFO_MEMBER(atarig42_state::get_alpha_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_alpha_tilemap->basemem_read(tile_index);
int code = data & 0xfff;
int color = (data >> 12) & 0x0f;
int opaque = data & 0x8000;
@@ -45,7 +45,7 @@ TILE_GET_INFO_MEMBER(atarig42_state::get_alpha_tile_info)
TILE_GET_INFO_MEMBER(atarig42_state::get_playfield_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = (m_playfield_tile_bank << 12) | (data & 0xfff);
int color = (m_playfield_base >> 5) + ((m_playfield_color_bank << 3) & 0x18) + ((data >> 12) & 7);
SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1);
diff --git a/src/mame/video/atarigt.cpp b/src/mame/video/atarigt.cpp
index 20610f2851f..6f1808b797f 100644
--- a/src/mame/video/atarigt.cpp
+++ b/src/mame/video/atarigt.cpp
@@ -46,7 +46,7 @@
TILE_GET_INFO_MEMBER(atarigt_state::get_alpha_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_alpha_tilemap->basemem_read(tile_index);
int code = data & 0xfff;
int color = (data >> 12) & 0x0f;
SET_TILE_INFO_MEMBER(1, code, color, 0);
@@ -55,7 +55,7 @@ TILE_GET_INFO_MEMBER(atarigt_state::get_alpha_tile_info)
TILE_GET_INFO_MEMBER(atarigt_state::get_playfield_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = (m_playfield_tile_bank << 12) | (data & 0xfff);
int color = (data >> 12) & 7;
SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1);
diff --git a/src/mame/video/atarigx2.cpp b/src/mame/video/atarigx2.cpp
index 79bb6234d91..db1d7b79a31 100644
--- a/src/mame/video/atarigx2.cpp
+++ b/src/mame/video/atarigx2.cpp
@@ -35,7 +35,7 @@
TILE_GET_INFO_MEMBER(atarigx2_state::get_alpha_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_alpha_tilemap->basemem_read(tile_index);
int code = data & 0xfff;
int color = (data >> 12) & 0x0f;
int opaque = data & 0x8000;
@@ -45,7 +45,7 @@ TILE_GET_INFO_MEMBER(atarigx2_state::get_alpha_tile_info)
TILE_GET_INFO_MEMBER(atarigx2_state::get_playfield_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = (m_playfield_tile_bank << 12) | (data & 0xfff);
int color = (m_playfield_base >> 5) + ((m_playfield_color_bank << 3) & 0x18) + ((data >> 12) & 7);
SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1);
diff --git a/src/mame/video/atarisy1.cpp b/src/mame/video/atarisy1.cpp
index 2f41ce7d5d1..30c46e10f9a 100644
--- a/src/mame/video/atarisy1.cpp
+++ b/src/mame/video/atarisy1.cpp
@@ -83,7 +83,7 @@ static const gfx_layout objlayout_6bpp =
TILE_GET_INFO_MEMBER(atarisy1_state::get_alpha_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_alpha_tilemap->basemem_read(tile_index);
int code = data & 0x3ff;
int color = (data >> 10) & 0x07;
int opaque = data & 0x2000;
@@ -93,7 +93,7 @@ TILE_GET_INFO_MEMBER(atarisy1_state::get_alpha_tile_info)
TILE_GET_INFO_MEMBER(atarisy1_state::get_playfield_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
uint16_t lookup = m_playfield_lookup[((data >> 8) & 0x7f) | (m_playfield_tile_bank << 7)];
int gfxindex = (lookup >> 8) & 15;
int code = ((lookup & 0xff) << 8) | (data & 0xff);
diff --git a/src/mame/video/atarisy2.cpp b/src/mame/video/atarisy2.cpp
index 0ded30fe3fc..ca38359a8f0 100644
--- a/src/mame/video/atarisy2.cpp
+++ b/src/mame/video/atarisy2.cpp
@@ -21,7 +21,7 @@
TILE_GET_INFO_MEMBER(atarisy2_state::get_alpha_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_alpha_tilemap->basemem_read(tile_index);
int code = data & 0x3ff;
int color = (data >> 13) & 0x07;
SET_TILE_INFO_MEMBER(2, code, color, 0);
@@ -30,7 +30,7 @@ TILE_GET_INFO_MEMBER(atarisy2_state::get_alpha_tile_info)
TILE_GET_INFO_MEMBER(atarisy2_state::get_playfield_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = m_playfield_tile_bank[(data >> 10) & 1] + (data & 0x3ff);
int color = (data >> 11) & 7;
SET_TILE_INFO_MEMBER(0, code, color, 0);
diff --git a/src/mame/video/badlands.cpp b/src/mame/video/badlands.cpp
index 92aecae9162..c8c0a955b99 100644
--- a/src/mame/video/badlands.cpp
+++ b/src/mame/video/badlands.cpp
@@ -20,7 +20,7 @@
TILE_GET_INFO_MEMBER(badlands_state::get_playfield_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = (data & 0x1fff) + ((data & 0x1000) ? (m_playfield_tile_bank << 12) : 0);
int color = (data >> 13) & 0x07;
SET_TILE_INFO_MEMBER(0, code, color, 0);
diff --git a/src/mame/video/batman.cpp b/src/mame/video/batman.cpp
index e555e057ddf..3d652be2551 100644
--- a/src/mame/video/batman.cpp
+++ b/src/mame/video/batman.cpp
@@ -19,7 +19,7 @@
TILE_GET_INFO_MEMBER(batman_state::get_alpha_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_vad->alpha().basemem_read(tile_index);
int code = ((data & 0x400) ? (m_alpha_tile_bank * 0x400) : 0) + (data & 0x3ff);
int color = (data >> 11) & 0x0f;
int opaque = data & 0x8000;
@@ -29,8 +29,8 @@ TILE_GET_INFO_MEMBER(batman_state::get_alpha_tile_info)
TILE_GET_INFO_MEMBER(batman_state::get_playfield_tile_info)
{
- uint16_t data1 = tilemap.basemem_read(tile_index);
- uint16_t data2 = tilemap.extmem_read(tile_index) & 0xff;
+ uint16_t data1 = m_vad->playfield().basemem_read(tile_index);
+ uint16_t data2 = m_vad->playfield().extmem_read(tile_index) & 0xff;
int code = data1 & 0x7fff;
int color = 0x10 + (data2 & 0x0f);
SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1);
@@ -40,8 +40,8 @@ TILE_GET_INFO_MEMBER(batman_state::get_playfield_tile_info)
TILE_GET_INFO_MEMBER(batman_state::get_playfield2_tile_info)
{
- uint16_t data1 = tilemap.basemem_read(tile_index);
- uint16_t data2 = tilemap.extmem_read(tile_index) >> 8;
+ uint16_t data1 = m_vad->playfield2().basemem_read(tile_index);
+ uint16_t data2 = m_vad->playfield2().extmem_read(tile_index) >> 8;
int code = data1 & 0x7fff;
int color = data2 & 0x0f;
SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1);
diff --git a/src/mame/video/blstroid.cpp b/src/mame/video/blstroid.cpp
index d69d6043fee..e36d33cbd94 100644
--- a/src/mame/video/blstroid.cpp
+++ b/src/mame/video/blstroid.cpp
@@ -21,7 +21,7 @@
TILE_GET_INFO_MEMBER(blstroid_state::get_playfield_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = data & 0x1fff;
int color = (data >> 13) & 0x07;
SET_TILE_INFO_MEMBER(0, code, color, 0);
diff --git a/src/mame/video/cyberbal.cpp b/src/mame/video/cyberbal.cpp
index 3a22913acc2..31b132a0436 100644
--- a/src/mame/video/cyberbal.cpp
+++ b/src/mame/video/cyberbal.cpp
@@ -23,7 +23,16 @@
TILE_GET_INFO_MEMBER(cyberbal_state::get_alpha_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_alpha_tilemap->basemem_read(tile_index);
+ int code = data & 0xfff;
+ int color = (data >> 12) & 0x07;
+ SET_TILE_INFO_MEMBER(2, code, color, (data >> 15) & 1);
+}
+
+
+TILE_GET_INFO_MEMBER(cyberbal_state::get_alpha2_tile_info)
+{
+ uint16_t data = m_alpha2_tilemap->basemem_read(tile_index);
int code = data & 0xfff;
int color = (data >> 12) & 0x07;
SET_TILE_INFO_MEMBER(2, code, color, (data >> 15) & 1);
@@ -32,13 +41,23 @@ TILE_GET_INFO_MEMBER(cyberbal_state::get_alpha_tile_info)
TILE_GET_INFO_MEMBER(cyberbal_state::get_playfield_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = data & 0x1fff;
int color = (data >> 11) & 0x0f;
SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1);
}
+TILE_GET_INFO_MEMBER(cyberbal_state::get_playfield2_tile_info)
+{
+ uint16_t data = m_playfield2_tilemap->basemem_read(tile_index);
+ int code = data & 0x1fff;
+ int color = (data >> 11) & 0x0f;
+ SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1);
+}
+
+
+
/*************************************
*
diff --git a/src/mame/video/eprom.cpp b/src/mame/video/eprom.cpp
index 89600f339d2..6fbb6e34657 100644
--- a/src/mame/video/eprom.cpp
+++ b/src/mame/video/eprom.cpp
@@ -53,7 +53,7 @@ void eprom_state::update_palette()
TILE_GET_INFO_MEMBER(eprom_state::get_alpha_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_alpha_tilemap->basemem_read(tile_index);
int code = data & 0x3ff;
int color = ((data >> 10) & 0x0f) | ((data >> 9) & 0x20);
int opaque = data & 0x8000;
@@ -63,8 +63,8 @@ TILE_GET_INFO_MEMBER(eprom_state::get_alpha_tile_info)
TILE_GET_INFO_MEMBER(eprom_state::get_playfield_tile_info)
{
- uint16_t data1 = tilemap.basemem_read(tile_index);
- uint16_t data2 = tilemap.extmem_read(tile_index) >> 8;
+ uint16_t data1 = m_playfield_tilemap->basemem_read(tile_index);
+ uint16_t data2 = m_playfield_tilemap->extmem_read(tile_index) >> 8;
int code = data1 & 0x7fff;
int color = 0x10 + (data2 & 0x0f);
SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1);
@@ -73,8 +73,8 @@ TILE_GET_INFO_MEMBER(eprom_state::get_playfield_tile_info)
TILE_GET_INFO_MEMBER(eprom_state::guts_get_playfield_tile_info)
{
- uint16_t data1 = tilemap.basemem_read(tile_index);
- uint16_t data2 = tilemap.extmem_read(tile_index) >> 8;
+ uint16_t data1 = m_playfield_tilemap->basemem_read(tile_index);
+ uint16_t data2 = m_playfield_tilemap->extmem_read(tile_index) >> 8;
int code = data1 & 0x7fff;
int color = 0x10 + (data2 & 0x0f);
SET_TILE_INFO_MEMBER(2, code, color, (data1 >> 15) & 1);
diff --git a/src/mame/video/foodf.cpp b/src/mame/video/foodf.cpp
index 6756d142642..2fed0782160 100644
--- a/src/mame/video/foodf.cpp
+++ b/src/mame/video/foodf.cpp
@@ -19,7 +19,7 @@
TILE_GET_INFO_MEMBER(foodf_state::get_playfield_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = (data & 0xff) | ((data >> 7) & 0x100);
int color = (data >> 8) & 0x3f;
SET_TILE_INFO_MEMBER(0, code, color, m_playfield_flip ? (TILE_FLIPX | TILE_FLIPY) : 0);
diff --git a/src/mame/video/gauntlet.cpp b/src/mame/video/gauntlet.cpp
index 0d9f42464bc..7d53b3f22bb 100644
--- a/src/mame/video/gauntlet.cpp
+++ b/src/mame/video/gauntlet.cpp
@@ -21,7 +21,7 @@
TILE_GET_INFO_MEMBER(gauntlet_state::get_alpha_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_alpha_tilemap->basemem_read(tile_index);
int code = data & 0x3ff;
int color = ((data >> 10) & 0x0f) | ((data >> 9) & 0x20);
int opaque = data & 0x8000;
@@ -31,7 +31,7 @@ TILE_GET_INFO_MEMBER(gauntlet_state::get_alpha_tile_info)
TILE_GET_INFO_MEMBER(gauntlet_state::get_playfield_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = ((m_playfield_tile_bank * 0x1000) + (data & 0xfff)) ^ 0x800;
int color = 0x10 + (m_playfield_color_bank * 8) + ((data >> 12) & 7);
SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1);
diff --git a/src/mame/video/klax.cpp b/src/mame/video/klax.cpp
index e699a5e066b..94544abc92f 100644
--- a/src/mame/video/klax.cpp
+++ b/src/mame/video/klax.cpp
@@ -20,8 +20,8 @@
TILE_GET_INFO_MEMBER(klax_state::get_playfield_tile_info)
{
- uint16_t data1 = tilemap.basemem_read(tile_index);
- uint16_t data2 = tilemap.extmem_read(tile_index) >> 8;
+ uint16_t data1 = m_playfield_tilemap->basemem_read(tile_index);
+ uint16_t data2 = m_playfield_tilemap->extmem_read(tile_index) >> 8;
int code = data1 & 0x1fff;
int color = data2 & 0x0f;
SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1);
diff --git a/src/mame/video/offtwall.cpp b/src/mame/video/offtwall.cpp
index 88ab1587fbf..9276f738cac 100644
--- a/src/mame/video/offtwall.cpp
+++ b/src/mame/video/offtwall.cpp
@@ -19,8 +19,8 @@
TILE_GET_INFO_MEMBER(offtwall_state::get_playfield_tile_info)
{
- uint16_t data1 = tilemap.basemem_read(tile_index);
- uint16_t data2 = tilemap.extmem_read(tile_index) >> 8;
+ uint16_t data1 = m_vad->playfield().basemem_read(tile_index);
+ uint16_t data2 = m_vad->playfield().extmem_read(tile_index) >> 8;
int code = data1 & 0x7fff;
int color = 0x10 + (data2 & 0x0f);
SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1);
diff --git a/src/mame/video/relief.cpp b/src/mame/video/relief.cpp
index c20200560b1..2b4f7432355 100644
--- a/src/mame/video/relief.cpp
+++ b/src/mame/video/relief.cpp
@@ -20,8 +20,8 @@
TILE_GET_INFO_MEMBER(relief_state::get_playfield_tile_info)
{
- uint16_t data1 = tilemap.basemem_read(tile_index);
- uint16_t data2 = tilemap.extmem_read(tile_index) & 0xff;
+ uint16_t data1 = m_vad->playfield().basemem_read(tile_index);
+ uint16_t data2 = m_vad->playfield().extmem_read(tile_index) & 0xff;
int code = data1 & 0x7fff;
int color = 0x20 + (data2 & 0x0f);
SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1);
@@ -30,8 +30,8 @@ TILE_GET_INFO_MEMBER(relief_state::get_playfield_tile_info)
TILE_GET_INFO_MEMBER(relief_state::get_playfield2_tile_info)
{
- uint16_t data1 = tilemap.basemem_read(tile_index);
- uint16_t data2 = tilemap.extmem_read(tile_index) >> 8;
+ uint16_t data1 = m_vad->playfield2().basemem_read(tile_index);
+ uint16_t data2 = m_vad->playfield2().extmem_read(tile_index) >> 8;
int code = data1 & 0x7fff;
int color = data2 & 0x0f;
SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1);
diff --git a/src/mame/video/shuuz.cpp b/src/mame/video/shuuz.cpp
index 2c721ac3901..eb0aa7089cf 100644
--- a/src/mame/video/shuuz.cpp
+++ b/src/mame/video/shuuz.cpp
@@ -19,8 +19,8 @@
TILE_GET_INFO_MEMBER(shuuz_state::get_playfield_tile_info)
{
- uint16_t data1 = tilemap.basemem_read(tile_index);
- uint16_t data2 = tilemap.extmem_read(tile_index) >> 8;
+ uint16_t data1 = m_vad->playfield().basemem_read(tile_index);
+ uint16_t data2 = m_vad->playfield().extmem_read(tile_index) >> 8;
int code = data1 & 0x3fff;
int color = data2 & 0x0f;
SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1);
diff --git a/src/mame/video/skullxbo.cpp b/src/mame/video/skullxbo.cpp
index ae4f5c04d36..3a10189dccb 100644
--- a/src/mame/video/skullxbo.cpp
+++ b/src/mame/video/skullxbo.cpp
@@ -19,7 +19,7 @@
TILE_GET_INFO_MEMBER(skullxbo_state::get_alpha_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_alpha_tilemap->basemem_read(tile_index);
int code = (data ^ 0x400) & 0x7ff;
int color = (data >> 11) & 0x0f;
int opaque = data & 0x8000;
@@ -29,8 +29,8 @@ TILE_GET_INFO_MEMBER(skullxbo_state::get_alpha_tile_info)
TILE_GET_INFO_MEMBER(skullxbo_state::get_playfield_tile_info)
{
- uint16_t data1 = tilemap.basemem_read(tile_index);
- uint16_t data2 = tilemap.extmem_read(tile_index) & 0xff;
+ uint16_t data1 = m_playfield_tilemap->basemem_read(tile_index);
+ uint16_t data2 = m_playfield_tilemap->extmem_read(tile_index) & 0xff;
int code = data1 & 0x7fff;
int color = data2 & 0x0f;
SET_TILE_INFO_MEMBER(1, code, color, (data1 >> 15) & 1);
diff --git a/src/mame/video/thunderj.cpp b/src/mame/video/thunderj.cpp
index 837f978d5b0..940333496b3 100644
--- a/src/mame/video/thunderj.cpp
+++ b/src/mame/video/thunderj.cpp
@@ -20,7 +20,7 @@
TILE_GET_INFO_MEMBER(thunderj_state::get_alpha_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_vad->alpha().basemem_read(tile_index);
int code = ((data & 0x200) ? (m_alpha_tile_bank * 0x200) : 0) + (data & 0x1ff);
int color = ((data >> 10) & 0x0f) | ((data >> 9) & 0x20);
int opaque = data & 0x8000;
@@ -30,8 +30,8 @@ TILE_GET_INFO_MEMBER(thunderj_state::get_alpha_tile_info)
TILE_GET_INFO_MEMBER(thunderj_state::get_playfield_tile_info)
{
- uint16_t data1 = tilemap.basemem_read(tile_index);
- uint16_t data2 = tilemap.extmem_read(tile_index) & 0xff;
+ uint16_t data1 = m_vad->playfield().basemem_read(tile_index);
+ uint16_t data2 = m_vad->playfield().extmem_read(tile_index) & 0xff;
int code = data1 & 0x7fff;
int color = 0x10 + (data2 & 0x0f);
SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1);
@@ -41,8 +41,8 @@ TILE_GET_INFO_MEMBER(thunderj_state::get_playfield_tile_info)
TILE_GET_INFO_MEMBER(thunderj_state::get_playfield2_tile_info)
{
- uint16_t data1 = tilemap.basemem_read(tile_index);
- uint16_t data2 = tilemap.extmem_read(tile_index) >> 8;
+ uint16_t data1 = m_vad->playfield2().basemem_read(tile_index);
+ uint16_t data2 = m_vad->playfield2().extmem_read(tile_index) >> 8;
int code = data1 & 0x7fff;
int color = data2 & 0x0f;
SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1);
diff --git a/src/mame/video/toobin.cpp b/src/mame/video/toobin.cpp
index 5cb499bfc10..e895cfbb662 100644
--- a/src/mame/video/toobin.cpp
+++ b/src/mame/video/toobin.cpp
@@ -20,7 +20,7 @@
TILE_GET_INFO_MEMBER(toobin_state::get_alpha_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_alpha_tilemap->basemem_read(tile_index);
int code = data & 0x3ff;
int color = (data >> 12) & 0x0f;
SET_TILE_INFO_MEMBER(2, code, color, (data >> 10) & 1);
@@ -29,7 +29,7 @@ TILE_GET_INFO_MEMBER(toobin_state::get_alpha_tile_info)
TILE_GET_INFO_MEMBER(toobin_state::get_playfield_tile_info)
{
- uint32_t data = tilemap.basemem_read(tile_index);
+ uint32_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = data & 0x3fff;
int color = (data >> 16) & 0x0f;
SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX(data >> 14));
diff --git a/src/mame/video/vindictr.cpp b/src/mame/video/vindictr.cpp
index 4ad03590a5c..1575a10c134 100644
--- a/src/mame/video/vindictr.cpp
+++ b/src/mame/video/vindictr.cpp
@@ -19,7 +19,7 @@
TILE_GET_INFO_MEMBER(vindictr_state::get_alpha_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_alpha_tilemap->basemem_read(tile_index);
int code = data & 0x3ff;
int color = ((data >> 10) & 0x0f) | ((data >> 9) & 0x20);
int opaque = data & 0x8000;
@@ -29,7 +29,7 @@ TILE_GET_INFO_MEMBER(vindictr_state::get_alpha_tile_info)
TILE_GET_INFO_MEMBER(vindictr_state::get_playfield_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = (m_playfield_tile_bank * 0x1000) + (data & 0xfff);
int color = 0x10 + 2 * ((data >> 12) & 7);
SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1);
diff --git a/src/mame/video/xybots.cpp b/src/mame/video/xybots.cpp
index be9a0711093..f0eec960268 100644
--- a/src/mame/video/xybots.cpp
+++ b/src/mame/video/xybots.cpp
@@ -21,7 +21,7 @@
TILE_GET_INFO_MEMBER(xybots_state::get_alpha_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_alpha_tilemap->basemem_read(tile_index);
int code = data & 0x3ff;
int color = (data >> 12) & 7;
int opaque = data & 0x8000;
@@ -31,7 +31,7 @@ TILE_GET_INFO_MEMBER(xybots_state::get_alpha_tile_info)
TILE_GET_INFO_MEMBER(xybots_state::get_playfield_tile_info)
{
- uint16_t data = tilemap.basemem_read(tile_index);
+ uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = data & 0x1fff;
int color = (data >> 11) & 0x0f;
SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1);