summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/tilemap.cpp
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2020-10-09 00:05:01 -0700
committer Aaron Giles <aaron@aarongiles.com>2020-10-09 00:05:01 -0700
commit7b1df38bd0ff7b17eed3d1709b67bd7eda210efc (patch)
tree26cec39203907463da4f6873290cfafe74aa9f97 /src/emu/tilemap.cpp
parent1b399b9e9b891b1a53290cdfdaa76b796ce1fd82 (diff)
parentac04c377a995c1d87fc889ad98ff772838bcf31f (diff)
Merge branch 'master' into aaron-nl3
Diffstat (limited to 'src/emu/tilemap.cpp')
-rw-r--r--src/emu/tilemap.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emu/tilemap.cpp b/src/emu/tilemap.cpp
index 4252b9259a2..5757f35341f 100644
--- a/src/emu/tilemap.cpp
+++ b/src/emu/tilemap.cpp
@@ -1611,14 +1611,14 @@ tilemap_manager::~tilemap_manager()
tilemap_t &tilemap_manager::create(device_gfx_interface &decoder, tilemap_get_info_delegate tile_get_info, tilemap_mapper_delegate mapper, u16 tilewidth, u16 tileheight, u32 cols, u32 rows, tilemap_t *allocated)
{
if (!allocated)
- allocated = global_alloc(tilemap_t)(machine().root_device());
+ allocated = new tilemap_t(machine().root_device());
return m_tilemap_list.append(allocated->init(*this, decoder, tile_get_info, mapper, tilewidth, tileheight, cols, rows));
}
tilemap_t &tilemap_manager::create(device_gfx_interface &decoder, tilemap_get_info_delegate tile_get_info, tilemap_standard_mapper mapper, u16 tilewidth, u16 tileheight, u32 cols, u32 rows, tilemap_t *allocated)
{
if (!allocated)
- allocated = global_alloc(tilemap_t)(machine().root_device());
+ allocated = new tilemap_t(machine().root_device());
return m_tilemap_list.append(allocated->init(*this, decoder, tile_get_info, mapper, tilewidth, tileheight, cols, rows));
}