Miroirs/mame
1
0
Fork 0
mirror of https://github.com/mamedev/mame.git synced 2024-09-28 03:20:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'mainline/release0264' into HEAD

Browse source
This commit is contained in:
Vas Crabb 2024-03-25 04:37:29 +11:00
commit 639ec00dff
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hash/megadriv.xml
View file

@ -6324,9 +6324,9 @@ Unsupported [Menacer] peripheral
</software>
<software name="pga2hb" cloneof="pga2" supported="no">
<description>HeartBeat PGA Tour Golf II</description>
<description>PGA Tour Golf II for use with the Personal Trainer</description>
<year>1995</year>
<publisher>Polar Technology</publisher> <!-- box art shows Polar Technology branding, but cartridge label says "HEARTBEAT CORP." -->
<publisher>HeartBeat Corp</publisher>
<info name="usage" value="Requires HeartBeat Personal Trainer activity tracker"/>
<part name="cart" interface="megadriv_cart">
<feature name="slot" value="rom"/>

2
src/lib/util/unzip.cpp
View file

@ -913,7 +913,7 @@ std::error_condition zip_file_impl::decompress(void *buffer, std::size_t length)
}
// get the compressed data offset
std::uint64_t offset;
std::uint64_t offset = 0;
auto const ziperr = get_compressed_data_offset(offset);
if (ziperr)
return ziperr;

2
src/mame/roland/roland_d70.cpp
View file

@ -530,4 +530,4 @@ ROM_END
} // anonymous namespace
SYST(1991, d70, 0, 0, d70, d70, roland_d70_state, init_d70, "Roland", "D-70 Super LA Synthetizer", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
SYST(1991, d70, 0, 0, d70, d70, roland_d70_state, init_d70, "Roland", "D-70 Super LA Synthesizer", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)

4
src/mame/sega/system1.cpp
View file

@ -5739,8 +5739,8 @@ GAME( 1986, raflesiau, raflesia, sys1ppi, raflesia, system1_state, e
/* PIO-based System 1 */
GAME( 1984, flicky, 0, sys1piox_315_5051, flicky, system1_state, empty_init, ROT0, "Sega", "Flicky (128k Version, 315-5051)", MACHINE_SUPPORTS_SAVE ) // 1984/05/24
GAME( 1984, flickya, flicky, sys1piox_315_5051, flicky, system1_state, empty_init, ROT0, "Sega", "Flicky (128k Version, 315-5051, larger roms)", MACHINE_SUPPORTS_SAVE ) // 1984/05/24
GAME( 1984, flickyb, flicky, sys1piox_315_5051, flickyb, system1_state, empty_init, ROT0, "Sega", "Flicky (128k Version, 315-5051, larger roms, newer)", MACHINE_SUPPORTS_SAVE ) // 1984/10/07
GAME( 1984, flickya, flicky, sys1piox_315_5051, flicky, system1_state, empty_init, ROT0, "Sega", "Flicky (128k Version, 315-5051, larger ROMs)", MACHINE_SUPPORTS_SAVE ) // 1984/05/24
GAME( 1984, flickyb, flicky, sys1piox_315_5051, flickyb, system1_state, empty_init, ROT0, "Sega", "Flicky (128k Version, 315-5051, larger ROMs, newer)", MACHINE_SUPPORTS_SAVE ) // 1984/10/07
GAME( 1984, flickys2, flicky, sys1pio, flickys2, system1_state, empty_init, ROT0, "Sega", "Flicky (128k Version, not encrypted)", MACHINE_SUPPORTS_SAVE )
GAME( 1984, thetogyu, bullfgt, sys1piox_315_5065, bullfgt, system1_state, empty_init, ROT0, "Coreland / Sega", "The Togyu (315-5065, Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1984, spatter, 0, sys1piosx_315_5096,spatter, system1_state, empty_init, ROT0, "Sega", "Spatter (315-5096)", MACHINE_SUPPORTS_SAVE )

2
src/mame/yamaha/ympsr2000.cpp
View file

@ -103,4 +103,4 @@ ROM_END
} // anonymous namespace
SYST( 2001, psr2000, 0, 0, psr2000, psr2000, psr2000_state, empty_init, "Yamaha", "PSR2000", MACHINE_IS_SKELETON )
SYST( 2001, psr2000, 0, 0, psr2000, psr2000, psr2000_state, empty_init, "Yamaha", "PSR-2000", MACHINE_IS_SKELETON )