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/peyper.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/peyper.cpp')
-rw-r--r-- | src/mame/drivers/peyper.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/mame/drivers/peyper.cpp b/src/mame/drivers/peyper.cpp index a8b41bc4a94..7ab3906aab9 100644 --- a/src/mame/drivers/peyper.cpp +++ b/src/mame/drivers/peyper.cpp @@ -55,9 +55,9 @@ public: { } DECLARE_CUSTOM_INPUT_MEMBER(wolfman_replay_hs_r); - DECLARE_DRIVER_INIT(peyper); - DECLARE_DRIVER_INIT(odin); - DECLARE_DRIVER_INIT(wolfman); + void init_peyper(); + void init_odin(); + void init_wolfman(); void peyper(machine_config &config); @@ -636,7 +636,7 @@ MACHINE_CONFIG_START(peyper_state::peyper) MACHINE_CONFIG_END // Not allowed to set up an array all at once, so we have this mess -DRIVER_INIT_MEMBER( peyper_state, peyper ) +void peyper_state::init_peyper() { m_disp_layout[0] = 25; m_disp_layout[1] = 27; @@ -676,7 +676,7 @@ DRIVER_INIT_MEMBER( peyper_state, peyper ) m_disp_layout[35] = 24; } -DRIVER_INIT_MEMBER( peyper_state, odin ) +void peyper_state::init_odin() { m_disp_layout[0] = 25; m_disp_layout[1] = 27; @@ -716,7 +716,7 @@ DRIVER_INIT_MEMBER( peyper_state, odin ) m_disp_layout[35] = 24; } -DRIVER_INIT_MEMBER( peyper_state, wolfman ) +void peyper_state::init_wolfman() { m_disp_layout[0] = 25; m_disp_layout[1] = 27; @@ -887,16 +887,16 @@ ROM_START(lancelot) ROM_LOAD("snd_u5.bin", 0x00000, 0x20000, CRC(bf141441) SHA1(630b852bb3bba0fcdae13ae548b1e9810bc64d7d)) ROM_END -GAME( 1985, odin, 0, peyper, odin_dlx, peyper_state, odin, ROT0, "Peyper", "Odin", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) -GAME( 1985, odin_dlx, 0, peyper, odin_dlx, peyper_state, odin, ROT0, "Sonic", "Odin De Luxe", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) -GAME( 1986, solarwap, 0, peyper, solarwap, peyper_state, peyper, ROT0, "Sonic", "Solar Wars (Sonic)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) -GAME( 1986, gamatros, 0, peyper, solarwap, peyper_state, peyper, ROT0, "Sonic", "Gamatron (Sonic)", MACHINE_IS_SKELETON_MECHANICAL) -GAME( 1987, poleposn, 0, peyper, poleposn, peyper_state, peyper, ROT0, "Sonic", "Pole Position (Sonic)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) -GAME( 1987, sonstwar, 0, peyper, sonstwar, peyper_state, peyper, ROT0, "Sonic", "Star Wars (Sonic, set 1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) -GAME( 1987, sonstwr2, sonstwar, peyper, sonstwar, peyper_state, peyper, ROT0, "Sonic", "Star Wars (Sonic, set 2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) -GAME( 1987, wolfman, 0, peyper, wolfman, peyper_state, wolfman, ROT0, "Peyper", "Wolf Man", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) -GAME( 1986, nemesisp, 0, peyper, wolfman, peyper_state, wolfman, ROT0, "Peyper", "Nemesis", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) -GAME( 1987, odisea, 0, peyper, odisea, peyper_state, wolfman, ROT0, "Peyper", "Odisea Paris-Dakar", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) -GAME( 1988, hangonp, 0, peyper, sonstwar, peyper_state, peyper, ROT0, "Sonic", "Hang-On (Sonic)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) // inputs to be checked -GAME( 1985, ator, 0, peyper, sonstwar, peyper_state, peyper, ROT0, "Video Dens", "Ator", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) // initial program ROM missing; no manual found -GAME( 1994, lancelot, 0, peyper, sonstwar, peyper_state, 0, ROT0, "Peyper", "Sir Lancelot", MACHINE_IS_SKELETON_MECHANICAL) // different hardware (see top of file) +GAME( 1985, odin, 0, peyper, odin_dlx, peyper_state, init_odin, ROT0, "Peyper", "Odin", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) +GAME( 1985, odin_dlx, 0, peyper, odin_dlx, peyper_state, init_odin, ROT0, "Sonic", "Odin De Luxe", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) +GAME( 1986, solarwap, 0, peyper, solarwap, peyper_state, init_peyper, ROT0, "Sonic", "Solar Wars (Sonic)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) +GAME( 1986, gamatros, 0, peyper, solarwap, peyper_state, init_peyper, ROT0, "Sonic", "Gamatron (Sonic)", MACHINE_IS_SKELETON_MECHANICAL) +GAME( 1987, poleposn, 0, peyper, poleposn, peyper_state, init_peyper, ROT0, "Sonic", "Pole Position (Sonic)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) +GAME( 1987, sonstwar, 0, peyper, sonstwar, peyper_state, init_peyper, ROT0, "Sonic", "Star Wars (Sonic, set 1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) +GAME( 1987, sonstwr2, sonstwar, peyper, sonstwar, peyper_state, init_peyper, ROT0, "Sonic", "Star Wars (Sonic, set 2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) +GAME( 1987, wolfman, 0, peyper, wolfman, peyper_state, init_wolfman, ROT0, "Peyper", "Wolf Man", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) +GAME( 1986, nemesisp, 0, peyper, wolfman, peyper_state, init_wolfman, ROT0, "Peyper", "Nemesis", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) +GAME( 1987, odisea, 0, peyper, odisea, peyper_state, init_wolfman, ROT0, "Peyper", "Odisea Paris-Dakar", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) +GAME( 1988, hangonp, 0, peyper, sonstwar, peyper_state, init_peyper, ROT0, "Sonic", "Hang-On (Sonic)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) // inputs to be checked +GAME( 1985, ator, 0, peyper, sonstwar, peyper_state, init_peyper, ROT0, "Video Dens", "Ator", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) // initial program ROM missing; no manual found +GAME( 1994, lancelot, 0, peyper, sonstwar, peyper_state, empty_init, ROT0, "Peyper", "Sir Lancelot", MACHINE_IS_SKELETON_MECHANICAL) // different hardware (see top of file) |