diff options
author | MooglyGuy <MooglyGuy@users.noreply.github.com> | 2018-05-13 15:22:22 +0200 |
---|---|---|
committer | Olivier Galibert <galibert@pobox.com> | 2018-05-13 22:22:22 +0900 |
commit | 5cc2319a2e286735981cb62781e65169ff936a52 (patch) | |
tree | 9465116c1856e052635215df0b98e400cc8bd020 /src/mame/drivers/kinst.cpp | |
parent | 49803e7418beefbd912d0090884063422888891d (diff) |
Removed DRIVER_INIT-related macros, made driver init entry in GAME/COMP/CONS explicit. (#3565)
* -Removed DRIVER_INIT macros in favor of explicitly-named member functions, nw
* -Removed DRIVER_INIT_related macros. Made init_ prefix on driver initializers explicit. Renamed init_0 to empty_init. Fixed up GAME/COMP/CONS macro spacing. [Ryan Holtz]
* Missed some files, nw
* Fix compile, (nw)
Diffstat (limited to 'src/mame/drivers/kinst.cpp')
-rw-r--r-- | src/mame/drivers/kinst.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/mame/drivers/kinst.cpp b/src/mame/drivers/kinst.cpp index af3ce554574..6d15f3bb279 100644 --- a/src/mame/drivers/kinst.cpp +++ b/src/mame/drivers/kinst.cpp @@ -220,8 +220,8 @@ public: DECLARE_WRITE32_MEMBER(ide_w); DECLARE_READ32_MEMBER(ide_extra_r); DECLARE_WRITE32_MEMBER(ide_extra_w); - DECLARE_DRIVER_INIT(kinst); - DECLARE_DRIVER_INIT(kinst2); + void init_kinst(); + void init_kinst2(); virtual void machine_start() override; virtual void machine_reset() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -819,7 +819,7 @@ ROM_END * *************************************/ -DRIVER_INIT_MEMBER(kinst_state,kinst) +void kinst_state::init_kinst() { static const uint8_t kinst_control_map[8] = { 0,1,2,3,4,5,6,7 }; @@ -838,7 +838,7 @@ DRIVER_INIT_MEMBER(kinst_state,kinst) } -DRIVER_INIT_MEMBER(kinst_state,kinst2) +void kinst_state::init_kinst2() { static const uint8_t kinst2_control_map[8] = { 2,4,1,0,3,5,6,7 }; @@ -873,8 +873,6 @@ DRIVER_INIT_MEMBER(kinst_state,kinst2) // versions selectable by changing bioses -GAME( 1994, kinst, 0, kinst, kinst, kinst_state, kinst, ROT0, "Rare", "Killer Instinct", MACHINE_SUPPORTS_SAVE ) - -GAME( 1995, kinst2, 0, kinst, kinst2, kinst_state, kinst2, ROT0, "Rare", "Killer Instinct 2", MACHINE_SUPPORTS_SAVE ) - -GAME( 1995, kinst2uk, kinst2, kinst, kinst2, kinst_state, kinst2, ROT0, "Rare", "Killer Instinct 2 (Upgrade kit)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) +GAME( 1994, kinst, 0, kinst, kinst, kinst_state, init_kinst, ROT0, "Rare", "Killer Instinct", MACHINE_SUPPORTS_SAVE ) +GAME( 1995, kinst2, 0, kinst, kinst2, kinst_state, init_kinst2, ROT0, "Rare", "Killer Instinct 2", MACHINE_SUPPORTS_SAVE ) +GAME( 1995, kinst2uk, kinst2, kinst, kinst2, kinst_state, init_kinst2, ROT0, "Rare", "Killer Instinct 2 (Upgrade kit)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) |