diff options
Diffstat (limited to 'src/emu/gamedrv.h')
-rw-r--r-- | src/emu/gamedrv.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/emu/gamedrv.h b/src/emu/gamedrv.h index 9026ac1ad38..8a9faf4b8f8 100644 --- a/src/emu/gamedrv.h +++ b/src/emu/gamedrv.h @@ -152,7 +152,7 @@ public: const char * parent; // if this is a clone, the name of the parent const char * year; // year the game was released const char * manufacturer; // manufacturer of the game - machine_config_constructor machine_config; // machine driver tokens + std::function<void (machine_config &, device_t *)> machine_creator; // machine driver tokens ioport_constructor ipt; // pointer to constructor for input ports driver_init_helper const & driver_init; // DRIVER_INIT callback const tiny_rom_entry * rom; // pointer to list of ROMs for the game @@ -202,7 +202,7 @@ extern game_driver const GAME_NAME(NAME) \ #PARENT, \ #YEAR, \ COMPANY, \ - MACHINE_CONFIG_NAME(MACHINE), \ + [] (machine_config &config, device_t *owner) { static_cast<CLASS *>(owner)->MACHINE(config); }, \ INPUT_PORTS_NAME(INPUT), \ game_driver::make_driver_init(&CLASS::init_##INIT), \ ROM_NAME(NAME), \ @@ -221,7 +221,7 @@ extern game_driver const GAME_NAME(NAME) \ #PARENT, \ #YEAR, \ COMPANY, \ - MACHINE_CONFIG_NAME(MACHINE), \ + [] (machine_config &config, device_t *owner) { static_cast<CLASS *>(owner)->MACHINE(config); }, \ INPUT_PORTS_NAME(INPUT), \ game_driver::make_driver_init(&CLASS::init_##INIT), \ ROM_NAME(NAME), \ @@ -241,7 +241,7 @@ extern game_driver const GAME_NAME(NAME) \ #PARENT, \ #YEAR, \ COMPANY, \ - MACHINE_CONFIG_NAME(MACHINE), \ + [] (machine_config &config, device_t *owner) { static_cast<CLASS *>(owner)->MACHINE(config); }, \ INPUT_PORTS_NAME(INPUT), \ game_driver::make_driver_init(&CLASS::init_##INIT), \ ROM_NAME(NAME), \ @@ -260,7 +260,7 @@ extern game_driver const GAME_NAME(NAME) \ #PARENT, \ #YEAR, \ COMPANY, \ - MACHINE_CONFIG_NAME(MACHINE), \ + [] (machine_config &config, device_t *owner) { static_cast<CLASS *>(owner)->MACHINE(config); }, \ INPUT_PORTS_NAME(INPUT), \ game_driver::make_driver_init(&CLASS::init_##INIT), \ ROM_NAME(NAME), \ @@ -279,7 +279,7 @@ extern game_driver const GAME_NAME(NAME) \ #PARENT, \ #YEAR, \ COMPANY, \ - MACHINE_CONFIG_NAME(MACHINE), \ + [] (machine_config &config, device_t *owner) { static_cast<CLASS *>(owner)->MACHINE(config); }, \ INPUT_PORTS_NAME(INPUT), \ game_driver::make_driver_init(&CLASS::init_##INIT), \ ROM_NAME(NAME), \ |