summaryrefslogtreecommitdiffstats
path: root/src/emu/tilemap.cpp
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2020-10-03 14:31:39 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2020-10-03 14:31:39 +1000
commitd1681a8ecef978ee34bafe24e95d34f25581e9c3 (patch)
tree958f96e617f2b5cb3c7c74536a14ad19d9a45be7 /src/emu/tilemap.cpp
parentb7de847b6e5f259fa5c67b43951586204a6ae387 (diff)
parent9ac531e2b9aa690910cbeb35a14bd93fb001592b (diff)
Merge remote-tracking branch 'upstream/master' into master
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));
}