summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/undrfire.cpp
diff options
context:
space:
mode:
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
commit5cc2319a2e286735981cb62781e65169ff936a52 (patch)
tree9465116c1856e052635215df0b98e400cc8bd020 /src/mame/drivers/undrfire.cpp
parent49803e7418beefbd912d0090884063422888891d (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/undrfire.cpp')
-rw-r--r--src/mame/drivers/undrfire.cpp61
1 files changed, 26 insertions, 35 deletions
diff --git a/src/mame/drivers/undrfire.cpp b/src/mame/drivers/undrfire.cpp
index af69fee3800..454c79fc982 100644
--- a/src/mame/drivers/undrfire.cpp
+++ b/src/mame/drivers/undrfire.cpp
@@ -1010,25 +1010,21 @@ ROM_START( cbombersp )
ROM_END
-DRIVER_INIT_MEMBER(undrfire_state,undrfire)
+void undrfire_state::init_undrfire()
{
- uint32_t offset,i;
uint8_t *gfx = memregion("gfx3")->base();
- int size=memregion("gfx3")->bytes();
- int data;
+ int size = memregion("gfx3")->bytes();
/* make SCC tile GFX format suitable for gfxdecode */
- offset = size/2;
- for (i = size/2+size/4; i<size; i++)
+ uint32_t offset = size / 2;
+ for (uint32_t i = size / 2 + size / 4; i < size; i++)
{
- int d1,d2,d3,d4;
-
/* Expand 2bits into 4bits format */
- data = gfx[i];
- d1 = (data>>0) & 3;
- d2 = (data>>2) & 3;
- d3 = (data>>4) & 3;
- d4 = (data>>6) & 3;
+ int data = gfx[i];
+ int d1 = (data>>0) & 3;
+ int d2 = (data>>2) & 3;
+ int d3 = (data>>4) & 3;
+ int d4 = (data>>6) & 3;
gfx[offset] = (d1<<2) | (d2<<6);
offset++;
@@ -1039,40 +1035,35 @@ DRIVER_INIT_MEMBER(undrfire_state,undrfire)
}
-DRIVER_INIT_MEMBER(undrfire_state,cbombers)
+void undrfire_state::init_cbombers()
{
- uint32_t offset,i;
uint8_t *gfx = memregion("gfx3")->base();
- int size=memregion("gfx3")->bytes();
- int data;
-
+ int size = memregion("gfx3")->bytes();
/* make SCC tile GFX format suitable for gfxdecode */
- offset = size/2;
- for (i = size/2+size/4; i<size; i++)
+ uint32_t offset = size/2;
+ for (uint32_t i = size/2+size/4; i<size; i++)
{
- int d1,d2,d3,d4;
-
/* Expand 2bits into 4bits format */
- data = gfx[i];
- d1 = (data>>0) & 3;
- d2 = (data>>2) & 3;
- d3 = (data>>4) & 3;
- d4 = (data>>6) & 3;
+ int data = gfx[i];
+ int d1 = (data >> 0) & 3;
+ int d2 = (data >> 2) & 3;
+ int d3 = (data >> 4) & 3;
+ int d4 = (data >> 6) & 3;
- gfx[offset] = (d1<<2) | (d2<<6);
+ gfx[offset] = (d1 << 2) | (d2 << 6);
offset++;
- gfx[offset] = (d3<<2) | (d4<<6);
+ gfx[offset] = (d3 << 2) | (d4 << 6);
offset++;
}
}
-GAME( 1993, undrfire, 0, undrfire, undrfire, undrfire_state, undrfire, ROT0, "Taito Corporation Japan", "Under Fire (World)", 0 )
-GAME( 1993, undrfireu, undrfire, undrfire, undrfire, undrfire_state, undrfire, ROT0, "Taito America Corporation", "Under Fire (US)", 0 )
-GAME( 1993, undrfirej, undrfire, undrfire, undrfire, undrfire_state, undrfire, ROT0, "Taito Corporation", "Under Fire (Japan)", 0 )
-GAMEL(1994, cbombers, 0, cbombers, cbombers, undrfire_state, cbombers, ROT0, "Taito Corporation Japan", "Chase Bombers (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NODEVICE_LAN, layout_cbombers )
-GAMEL(1994, cbombersj, cbombers, cbombers, cbombers, undrfire_state, cbombers, ROT0, "Taito Corporation", "Chase Bombers (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NODEVICE_LAN, layout_cbombers )
-GAMEL(1994, cbombersp, cbombers, cbombers, cbombers, undrfire_state, cbombers, ROT0, "Taito Corporation", "Chase Bombers (Japan Prototype)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NODEVICE_LAN, layout_cbombers )
+GAME( 1993, undrfire, 0, undrfire, undrfire, undrfire_state, init_undrfire, ROT0, "Taito Corporation Japan", "Under Fire (World)", 0 )
+GAME( 1993, undrfireu, undrfire, undrfire, undrfire, undrfire_state, init_undrfire, ROT0, "Taito America Corporation", "Under Fire (US)", 0 )
+GAME( 1993, undrfirej, undrfire, undrfire, undrfire, undrfire_state, init_undrfire, ROT0, "Taito Corporation", "Under Fire (Japan)", 0 )
+GAMEL(1994, cbombers, 0, cbombers, cbombers, undrfire_state, init_cbombers, ROT0, "Taito Corporation Japan", "Chase Bombers (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NODEVICE_LAN, layout_cbombers )
+GAMEL(1994, cbombersj, cbombers, cbombers, cbombers, undrfire_state, init_cbombers, ROT0, "Taito Corporation", "Chase Bombers (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NODEVICE_LAN, layout_cbombers )
+GAMEL(1994, cbombersp, cbombers, cbombers, cbombers, undrfire_state, init_cbombers, ROT0, "Taito Corporation", "Chase Bombers (Japan Prototype)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NODEVICE_LAN, layout_cbombers )