diff options
author | 2016-01-20 21:42:13 +0100 | |
---|---|---|
committer | 2016-01-20 21:42:13 +0100 | |
commit | 4e8e3066f847cc0fa11539f4d9ab8a63f70ca475 (patch) | |
tree | 25d48b50f2b89dd5b9e7dbbfeeb85c534ec6852a /src/emu/tilemap.cpp | |
parent | 3a8ccb89b426509be06089a19c51ecf55567ed1b (diff) |
reverting:
SHA-1: 1f90ceab075c4869298e963bf0a14a0aac2f1caa
* tags are now strings (nw)
fix start project for custom builds in Visual Studio (nw)
Diffstat (limited to 'src/emu/tilemap.cpp')
-rw-r--r-- | src/emu/tilemap.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/emu/tilemap.cpp b/src/emu/tilemap.cpp index 2a8d8ae7f73..2c7334bb068 100644 --- a/src/emu/tilemap.cpp +++ b/src/emu/tilemap.cpp @@ -409,17 +409,17 @@ tilemap_t &tilemap_t::init(tilemap_manager &manager, device_gfx_interface &decod // save relevant state int instance = manager.alloc_instance(); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_enable)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_attributes)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_palette_offset)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_scrollrows)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_scrollcols)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_rowscroll)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_colscroll)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_dx)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_dx_flipped)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_dy)); - machine().save().save_item(m_device, "tilemap", std::string(), instance, NAME(m_dy_flipped)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_enable)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_attributes)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_palette_offset)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_scrollrows)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_scrollcols)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_rowscroll)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_colscroll)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_dx)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_dx_flipped)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_dy)); + machine().save().save_item(m_device, "tilemap", nullptr, instance, NAME(m_dy_flipped)); // reset everything after a load machine().save().register_postload(save_prepost_delegate(FUNC(tilemap_t::postload), this)); @@ -1586,7 +1586,7 @@ const device_type TILEMAP = &device_creator<tilemap_device>; // tilemap_device - constructor //------------------------------------------------- -tilemap_device::tilemap_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) +tilemap_device::tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TILEMAP, "Tilemap", tag, owner, clock, "tilemap", __FILE__), m_gfxdecode(*this), m_standard_mapper(TILEMAP_STANDARD_COUNT), @@ -1606,7 +1606,7 @@ tilemap_device::tilemap_device(const machine_config &mconfig, std::string tag, d // gfx decoder //------------------------------------------------- -void tilemap_device::static_set_gfxdecode_tag(device_t &device, std::string tag) +void tilemap_device::static_set_gfxdecode_tag(device_t &device, const char *tag) { downcast<tilemap_device &>(device).m_gfxdecode.set_tag(tag); } @@ -1764,9 +1764,9 @@ void tilemap_device::device_start() { // check configuration if (m_get_info.isnull()) - throw emu_fatalerror("Tilemap device '%s' has no get info callback!", tag().c_str()); + throw emu_fatalerror("Tilemap device '%s' has no get info callback!", tag()); if (m_standard_mapper == TILEMAP_STANDARD_COUNT && m_mapper.isnull()) - throw emu_fatalerror("Tilemap device '%s' has no mapper callback!", tag().c_str()); + throw emu_fatalerror("Tilemap device '%s' has no mapper callback!", tag()); if(!m_gfxdecode->started()) throw device_missing_dependencies(); |