From e8998a9236992afa5c1fa4a41beaad534209faf9 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 26 Nov 2020 13:47:02 +1100 Subject: -luaengine_render.cpp: Work around MSVC ambiguous overload error. -docs: Clean up a little. * Includes typo fixes from Alexander Miller. --- src/frontend/mame/luaengine_render.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/frontend/mame/luaengine_render.cpp') diff --git a/src/frontend/mame/luaengine_render.cpp b/src/frontend/mame/luaengine_render.cpp index 94945ad0bf1..3e5db2f52c3 100644 --- a/src/frontend/mame/luaengine_render.cpp +++ b/src/frontend/mame/luaengine_render.cpp @@ -426,7 +426,7 @@ void lua_engine::initialize_render() i.set_element_state_callback(layout_view::item::state_delegate( [this, cbfunc = cb.as()] () -> int { - sol::optional result(invoke(cbfunc)); + auto result(invoke(cbfunc).get >()); if (result) { return result.value(); @@ -455,7 +455,7 @@ void lua_engine::initialize_render() i.set_animation_state_callback(layout_view::item::state_delegate( [this, cbfunc = cb.as()] () -> int { - sol::optional result(invoke(cbfunc)); + auto result(invoke(cbfunc).get >()); if (result) { return result.value(); @@ -484,7 +484,7 @@ void lua_engine::initialize_render() i.set_bounds_callback(layout_view::item::bounds_delegate( [this, cbfunc = cb.as()] (render_bounds &b) { - sol::optional result(invoke(cbfunc)); + auto result(invoke(cbfunc).get >()); if (result) { b = result.value(); @@ -513,7 +513,7 @@ void lua_engine::initialize_render() i.set_color_callback(layout_view::item::color_delegate( [this, cbfunc = cb.as()] (render_color &c) { - sol::optional result(invoke(cbfunc)); + auto result(invoke(cbfunc).get >()); if (result) { c = result.value(); -- cgit v1.2.3