Merge branch 'release0250' into mainline-master

This commit is contained in:
Vas Crabb 2022-11-28 05:32:55 +11:00
commit 5632f5e52b
4 changed files with 10 additions and 9 deletions

View File

@ -13280,7 +13280,7 @@ kept for now until finding out what those bytes affect...
</software>
<software name="msxlogo">
<description>MSX-Logo (English UK)</description>
<description>MSX-Logo (UK)</description>
<year>1985</year>
<publisher>Philips UK</publisher>
<info name="serial" value="VG 8103/20" />
@ -13303,7 +13303,7 @@ kept for now until finding out what those bytes affect...
</software>
<software name="msxlogobr11" cloneof="msxlogo">
<description>MSX-Logo (Brazil) HOT-Logo Version 1.1</description>
<description>HOT-LOGO (Brazil, version 1.1)</description>
<year>1986</year>
<publisher>Epcom</publisher>
<part name="cart" interface="msx_cart">
@ -13314,7 +13314,7 @@ kept for now until finding out what those bytes affect...
</software>
<software name="msxlogobr12" cloneof="msxlogo">
<description>MSX-Logo (Brazil) HOT-Logo Version 1.2</description>
<description>HOT-LOGO (Brazil, version 1.2)</description>
<year>1986</year>
<publisher>Epcom</publisher>
<part name="cart" interface="msx_cart">
@ -13349,9 +13349,10 @@ kept for now until finding out what those bytes affect...
</software>
<software name="msxlogopl" cloneof="msxlogo">
<description>MSX-Logo (Poland) COMtech</description>
<description>MSX-Logo (Poland)</description>
<year>1987</year>
<publisher>COMtech</publisher>
<info name="alt_title" value="COMTECH-LOGO" />
<part name="cart" interface="msx_cart">
<dataarea name="rom" size="32768">
<rom name="msxlogo_pl.rom" size="32768" crc="98d394eb" sha1="4354b46484c07c43eec80a92e405e13c2a8fcb73" offset="0" />

View File

@ -8482,7 +8482,7 @@ license:CC0
</software>
<software name="lengegb7">
<description>Lenguaje 7° E.G.B. (Spain)</description>
<description>Lenguaje 7º E.G.B. (Spain)</description>
<year>1985</year>
<publisher>Santillana</publisher>
<info name="usage" value="Load with CLOAD + RUN"/>
@ -8495,7 +8495,7 @@ license:CC0
</software>
<software name="lengegb8">
<description>Lenguaje 8° E.G.B. (Spain)</description>
<description>Lenguaje 8º E.G.B. (Spain)</description>
<year>1985</year>
<publisher>Santillana</publisher>
<info name="serial" value="CJ17"/>

View File

@ -54,7 +54,7 @@ inline std::string &path_append(std::string &path, T &&next, U &&... more)
if (!path.empty() && !is_directory_separator(path.back()))
path.append(PATH_SEPARATOR);
path.append(std::forward<T>(next));
if constexpr (sizeof...(U))
if constexpr (sizeof...(U) > 0U)
return path_append(path, std::forward<U>(more)...);
else
return path;
@ -72,7 +72,7 @@ template <typename T, typename... U>
inline std::string path_concat(T &&first, U &&... more)
{
std::string result(std::forward<T>(first));
if constexpr (sizeof...(U))
if constexpr (sizeof...(U) > 0U)
path_append(result, std::forward<U>(more)...);
return result;
}

View File

@ -331,4 +331,4 @@ ROM_START(dx7)
ROM_LOAD("hd6805s1p-a33.ic13", 0x0000, 0x800, CRC(ac1d84b3) SHA1(ee0ebb118dd0d282d7c195d3b246a0094b2cb6ad))
ROM_END
SYST(1983, dx7, 0, 0, dx7, dx7, yamaha_dx7_state, empty_init, "Yamaha", "DX-7 Digital Programmable Algorithm Synthesizer", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
SYST(1983, dx7, 0, 0, dx7, dx7, yamaha_dx7_state, empty_init, "Yamaha", "DX7 Digital Programmable Algorithm Synthesizer", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)