diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2015-01-13 17:48:41 +0100 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2015-01-13 17:48:41 +0100 |
commit | b1876ae1a347c07d176bcb381d4ef54fcbd897c7 (patch) | |
tree | c6f328def2212ed432e2f014d702a7acace10d37 | |
parent | f7a05d9b140dbd88e8d646e8e5e679183f27bd55 (diff) | |
parent | b25960ad9311ad5af77d3d09786c316c40b463af (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
-rw-r--r-- | src/mame/drivers/segajw.c | 2 | ||||
-rw-r--r-- | src/mess/drivers/gamate.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/mame/drivers/segajw.c b/src/mame/drivers/segajw.c index 77bfd8fccaa..b6b4715d6bf 100644 --- a/src/mame/drivers/segajw.c +++ b/src/mame/drivers/segajw.c @@ -438,4 +438,4 @@ ROM_START( segajw ) ROM_END -GAMEL( 198?, segajw, 0, segajw, segajw, driver_device, 0, ROT0, "Sega", "Golden Poker Series \"Joker's Wild\" (Rev. B)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_IMPERFECT_GRAPHICS, layout_segajw ) // TODO: correct title +GAMEL( 1991, segajw, 0, segajw, segajw, driver_device, 0, ROT0, "Sega", "Golden Poker Series \"Joker's Wild\" (Rev. B)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_IMPERFECT_GRAPHICS, layout_segajw ) // TODO: correct title diff --git a/src/mess/drivers/gamate.c b/src/mess/drivers/gamate.c index 656e7408eb3..c246c790ea7 100644 --- a/src/mess/drivers/gamate.c +++ b/src/mess/drivers/gamate.c @@ -267,12 +267,6 @@ static GFXDECODE_START( gamate ) GFXDECODE_END #endif -static const unsigned short gamate_palette[4] = -{ - 0,1,2,3 -}; - - /* palette in red, green, blue tribles */ static const unsigned char gamate_colors[4][3] = { |