Previous 199869 Revisions Next

r41423 Wednesday 28th October, 2015 at 15:26:06 UTC by David Haywood
Merge pull request #441 from sparrowred/master

fixed whitespace for publishers and descriptions in softwarelist xmls…
[3rdparty/bgfx/3rdparty/dxsdk/include]dxgitype.h
[scripts/src/osd]sdl.lua
[src/mame]arcade.lst
[src/mame/drivers]goldstar.c wacky_gator.c

trunk/3rdparty/bgfx/3rdparty/dxsdk/include/dxgitype.h
r249934r249935
1010#define MAKE_DXGI_HRESULT(code) MAKE_HRESULT(1, _FACDXGI, code)
1111#define MAKE_DXGI_STATUS(code)  MAKE_HRESULT(0, _FACDXGI, code)
1212
13#if defined(__MINGW32__) || !defined(DXGI_ERROR_INVALID_CALL)
13#if !defined(DXGI_ERROR_INVALID_CALL)
1414#   define DXGI_STATUS_OCCLUDED                     MAKE_DXGI_STATUS(1)
1515#   define DXGI_STATUS_CLIPPED                      MAKE_DXGI_STATUS(2)
1616#   define DXGI_STATUS_NO_REDIRECTION               MAKE_DXGI_STATUS(4)
trunk/scripts/src/osd/sdl.lua
r249934r249935
5555            "SDL.dll",
5656         }
5757      end
58      links {
59         "psapi",
60      }
5861
5962      configuration { "mingw*-gcc" }
6063         linkoptions{
r249934r249935
467470               "SDL.dll",
468471            }
469472         end
473         links {
474            "psapi",
475         }
470476         linkoptions{
471477            "-municode",
472478         }
trunk/src/mame/arcade.lst
r249934r249935
99789978tdoboon         // (c) 2000 Sammy
99799979haekaka         // (c) 2001 Sammy
99809980
9981// IGS games ( www.igs.com.tw
9981// IGS games (www.igs.com.tw)
99829982goldstar        // (c) 198? IGS
99839983goldstbl        // (c) 198? IGS
99849984moonlght        // bootleg
r249934r249935
1201512015cmast91         // (c) 1991 Dyna Electronics
1201612016cmast92         // (c) 1992 Dyna Electronics
1201712017cmast97         // (c) 1996 Dyna Electronics
12018cmast99         // 1999?
1201812019
1201912020tonypok         // (c) 1991 Corsica
1202012021jkrmast         // (c) 199? unknown
trunk/src/mame/drivers/goldstar.c
r249934r249935
90339033ROM_END
90349034
90359035
9036ROM_START( cmast99 )
9037   ROM_REGION( 0x10000, "maincpu", 0 )
9038   ROM_LOAD( "cm99-041-8.u81", 0x0000, 0x1000, CRC(e0872d9f) SHA1(6d8f5e09e5c9daf834d5c74434eae86e5dd7e194) )
9039   ROM_CONTINUE(0x4000,0x1000)
9040   ROM_CONTINUE(0x3000,0x1000)
9041   ROM_CONTINUE(0x7000,0x1000)
9042   ROM_CONTINUE(0x1000,0x1000)
9043   ROM_CONTINUE(0x6000,0x1000) /* maybe wrong */
9044   ROM_CONTINUE(0x2000,0x1000)
9045   ROM_CONTINUE(0x5000,0x1000) /* maybe wrong */
9046   ROM_CONTINUE(0x8000,0x1000)
9047   ROM_CONTINUE(0x9000,0x1000) /* maybe wrong */
9048   ROM_CONTINUE(0xa000,0x1000) /* maybe wrong */
9049   ROM_CONTINUE(0xb000,0x1000) /* maybe wrong */
9050   ROM_CONTINUE(0xc000,0x1000) /* maybe wrong */
9051   ROM_CONTINUE(0xd000,0x3000) /* padding that isn't visible to CPU (RAM mapped here) */
9052
9053   ROM_REGION( 0x18000, "gfx1", 0 )
9054   ROM_LOAD( "cm99-041-7.u16", 0x00000, 0x8000, CRC(69e2aef2) SHA1(195faec239734650dcd777d55a8da84e3a0ed50c) )
9055   ROM_LOAD( "cm99-041-6.u11", 0x08000, 0x8000, CRC(900f36f5) SHA1(0fd41f8c8cb2f7940b653a1fad93df2e3f28a34b) )
9056   ROM_LOAD( "cm99-041-5.u4",  0x10000, 0x8000, CRC(3e465e38) SHA1(847dc27e45d495cb924b3fd5ce8e68a1cb83ffc8) )
9057
9058   ROM_REGION( 0x8000, "gfx2", 0 )
9059   ROM_LOAD( "cm99-041-4.u15", 0x0000, 0x2000, CRC(6b870b29) SHA1(d65f24817d9d45c148cb857439b46e9e75dabfe7) )
9060   ROM_LOAD( "cm99-041-3.u10", 0x2000, 0x2000, CRC(8a0b205f) SHA1(3afea0464b793526bf23610cac6736a31edc7ec2) )
9061   ROM_LOAD( "cm99-041-2.u14", 0x4000, 0x2000, CRC(c84dba45) SHA1(ab4ac891a23d6b9a216df046d516e868c77e8a36) )
9062   ROM_LOAD( "cm99-041-1.u9",  0x6000, 0x2000, CRC(44046c31) SHA1(c9703ce2371cf86bc597e5fdb9c0d4dd6d91f7dc) )
9063
9064   ROM_REGION( 0x10000, "user1", 0 )
9065   ROM_FILL( 0x0000, 0x10000, 0xff ) // U53 (girl bitmaps) not populated
9066
9067   /* proms taken from cmv4, probably wrong  */
9068   ROM_REGION( 0x200, "proms", 0 )
9069   ROM_LOAD( "82s129.u84", 0x0000, 0x0100, CRC(0489b760) SHA1(78f8632b17a76335183c5c204cdec856988368b0) BAD_DUMP )
9070   ROM_LOAD( "82s129.u70", 0x0100, 0x0100, CRC(21eb5b19) SHA1(9b8425bdb97f11f4855c998c7792c3291fd07470) BAD_DUMP )
9071
9072   ROM_REGION( 0x100, "proms2", 0 )
9073   ROM_LOAD( "82s129.u46", 0x0000, 0x0100, CRC(50ec383b) SHA1(ae95b92bd3946b40134bcdc22708d5c6b0f4c23e) BAD_DUMP )
9074ROM_END
9075
9076
90369077ROM_START( chryangl )
90379078   ROM_REGION( 0x10000, "maincpu", 0 )
90389079   ROM_LOAD( "8.u6",  0x0000, 0x10000, CRC(331961e4) SHA1(50c7e0e983aed1f199f238442bb8fafce1849f84) )
r249934r249935
1327513316GAMEL( 1991, cmasterd,  cmaster,  cm,       cmasterb, cmaster_state,  cmv4,      ROT0, "Dyna",              "Cherry Master I (ver.1.01, set 5)",           0,                 layout_cmasterb )
1327613317GAMEL( 1991, cmastere,  cmaster,  cm,       cmasterb, cmaster_state,  cmv4,      ROT0, "Dyna",              "Cherry Master I (ver.1.01, set 6)",           0,                 layout_cmasterb )
1327713318GAMEL( 1991, cmasterf,  cmaster,  cm,       cmasterb, cmaster_state,  cmv4,      ROT0, "Dyna",              "Cherry Master I (ver.1.01, set 7)",           0,                 layout_cmasterb )
13319GAME(  199?, cmast99,   0,        cm,       cmv4,     cmaster_state,  cmv4,      ROT0, "????",              "Cherry Master '99",                           MACHINE_NOT_WORKING )
1327813320
1327913321
1328013322GAMEL( 1991, tonypok,   0,        cm,       tonypok,  cmaster_state,  tonypok,   ROT0, "Corsica",           "Poker Master (Tony-Poker V3.A, hack?)",       0 ,                layout_tonypok )
trunk/src/mame/drivers/wacky_gator.c
r249934r249935
11// license:GPL2+
2// copyright-holders:FelipeSanches
2// copyright-holders:FelipeSanches, Sandro Ronco
33//
44// Wacky Gator
55//
6// Driver by Felipe Correa da Silva Sanches <juca@members.fsf.org>
6// Driver by Sandro Ronco and
7//  Felipe Correa da Silva Sanches <juca@members.fsf.org>
78//
89
910/*

https://github.com/mamedev/mame/commit/7e6170d88d241d9ad5f3d40c7031a71e2c6304a7

Previous 199869 Revisions Next

© 1997-2024 The MAME Team