Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-21 16:01:56 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'release0254' into mainline-master

Browse Source
This commit is contained in:
Vas Crabb 2023-04-25 04:15:15 +10:00
commit cfb6760ff9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hash/msx1_cart.xml
View File

@ -17660,7 +17660,7 @@ legacy FM implementations cannot find it.
</software>
<software name="whisitp" cloneof="whisit">
<description>Where Is It? The Quest for the 10th Island (proto)</description>
<description>Where Is It? The Quest for the 10th Island (prototype)</description>
<year>2021</year>
<publisher>&lt;homebrew&gt;</publisher>
<info name="developer" value="Eric Mendel"/>

6
src/frontend/mame/luaengine.ipp
View File

@ -589,10 +589,10 @@ auto lua_engine::make_notifier_adder(util::notifier<T...> &notifier, const char
delegate<void (T...)>(
[this, desc, cbfunc = sol::protected_function(m_lua_state, cb)] (T... args)
{
auto status = invoke(cbfunc, args...);
auto status(invoke(cbfunc, args...));
if (!status.valid())
{
sol::error err(status);
auto err(status.template get<sol::error>());
osd_printf_error("[LUA ERROR] error in %s callback: %s\n", desc, err.what());
}
}));
@ -643,7 +643,7 @@ auto lua_engine::make_simple_callback_setter(void (T::*setter)(delegate<R ()> &&
}
else
{
sol::error err(status);
auto err(status.get<sol::error>());
osd_printf_error("[LUA ERROR] error in %s callback: %s\n", desc, err.what());
if constexpr (!std::is_same_v<R, void>)
return dflt();

2
src/mame/sega/anyworks.cpp
View File

@ -112,4 +112,4 @@ ROM_END
} // anonymous namespace
GAME( 2010, unkanyw, 0, unkanyw, unkanyw, anyworks_state, empty_init, ROT0, "AnyWorks / Sega", "unknown AnyWorks / Sega medal game bios", MACHINE_IS_SKELETON )
GAME( 2010, unkanyw, 0, unkanyw, unkanyw, anyworks_state, empty_init, ROT0, "AnyWorks / Sega", "unknown AnyWorks / Sega medal game BIOS", MACHINE_IS_SKELETON )