diff options
author | 2020-11-26 13:47:02 +1100 | |
---|---|---|
committer | 2020-11-26 13:47:02 +1100 | |
commit | e8998a9236992afa5c1fa4a41beaad534209faf9 (patch) | |
tree | fa0ed2d8697d32d8d5033d35ceaa5fe92cc864d9 /src/frontend/mame/luaengine_render.cpp | |
parent | 149a2523fe9db23120b48f2e5596219733c7a5e7 (diff) |
-luaengine_render.cpp: Work around MSVC ambiguous overload error.
-docs: Clean up a little.
* Includes typo fixes from Alexander Miller.
Diffstat (limited to 'src/frontend/mame/luaengine_render.cpp')
-rw-r--r-- | src/frontend/mame/luaengine_render.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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<sol::protected_function>()] () -> int { - sol::optional<int> result(invoke(cbfunc)); + auto result(invoke(cbfunc).get<sol::optional<int> >()); 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<sol::protected_function>()] () -> int { - sol::optional<int> result(invoke(cbfunc)); + auto result(invoke(cbfunc).get<sol::optional<int> >()); 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<sol::protected_function>()] (render_bounds &b) { - sol::optional<render_bounds> result(invoke(cbfunc)); + auto result(invoke(cbfunc).get<sol::optional<render_bounds> >()); 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<sol::protected_function>()] (render_color &c) { - sol::optional<render_color> result(invoke(cbfunc)); + auto result(invoke(cbfunc).get<sol::optional<render_color> >()); if (result) { c = result.value(); |