summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/emu/luaengine.cpp12
-rw-r--r--src/emu/luaengine.h4
-rw-r--r--src/emu/ui/pluginopt.cpp18
3 files changed, 22 insertions, 12 deletions
diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp
index a5cd130fb81..d6acd940726 100644
--- a/src/emu/luaengine.cpp
+++ b/src/emu/luaengine.cpp
@@ -1738,9 +1738,8 @@ lua_engine::~lua_engine()
close();
}
-std::vector<lua_engine::menu_item> &lua_engine::menu_populate(std::string &menu)
+void lua_engine::menu_populate(std::string &menu, std::vector<menu_item> &menu_list)
{
- std::vector<menu_item> &menu_list = *global_alloc(std::vector<menu_item>);
std::string field = "menu_pop_" + menu;
lua_settop(m_lua_state, 0);
lua_getfield(m_lua_state, LUA_REGISTRYINDEX, field.c_str());
@@ -1748,19 +1747,19 @@ std::vector<lua_engine::menu_item> &lua_engine::menu_populate(std::string &menu)
if(!lua_isfunction(m_lua_state, -1))
{
lua_pop(m_lua_state, 1);
- return menu_list;
+ return;
}
if(int error = lua_pcall(m_lua_state, 0, 1, 0))
{
if(error == 2)
printf("%s\n", lua_tostring(m_lua_state, -1));
lua_pop(m_lua_state, 1);
- return menu_list;
+ return;
}
if(!lua_istable(m_lua_state, -1))
{
lua_pop(m_lua_state, 1);
- return menu_list;
+ return;
}
lua_pushnil(m_lua_state);
@@ -1776,14 +1775,13 @@ std::vector<lua_engine::menu_item> &lua_engine::menu_populate(std::string &menu)
item.subtext = lua_tostring(m_lua_state, -1);
lua_pop(m_lua_state, 1);
lua_rawgeti(m_lua_state, -1, 3);
- item.flags = lua_tointeger(m_lua_state, -1);
+ item.flags = lua_tostring(m_lua_state, -1);
lua_pop(m_lua_state, 1);
menu_list.push_back(item);
}
lua_pop(m_lua_state, 1);
}
lua_pop(m_lua_state, 1);
- return menu_list;
}
bool lua_engine::menu_callback(std::string &menu, int index, std::string event)
diff --git a/src/emu/luaengine.h b/src/emu/luaengine.h
index 69247a84cdf..aaa774d00e6 100644
--- a/src/emu/luaengine.h
+++ b/src/emu/luaengine.h
@@ -52,9 +52,9 @@ public:
struct menu_item {
std::string text;
std::string subtext;
- int flags;
+ std::string flags;
};
- std::vector<menu_item> &menu_populate(std::string &menu);
+ void menu_populate(std::string &menu, std::vector<menu_item> &menu_list);
bool menu_callback(std::string &menu, int index, std::string event);
void resume(lua_State *L, int nparam = 0, lua_State *root = nullptr);
diff --git a/src/emu/ui/pluginopt.cpp b/src/emu/ui/pluginopt.cpp
index 625d60600f1..d209eed8fcc 100644
--- a/src/emu/ui/pluginopt.cpp
+++ b/src/emu/ui/pluginopt.cpp
@@ -87,12 +87,24 @@ void ui_menu_plugin_opt::handle()
void ui_menu_plugin_opt::populate()
{
- std::vector<lua_engine::menu_item> &menu_list = machine().manager().lua()->menu_populate(m_menu);
+ std::vector<lua_engine::menu_item> menu_list;
+ machine().manager().lua()->menu_populate(m_menu, menu_list);
FPTR i = 1;
for(auto &item : menu_list)
- item_append(item.text.c_str(), item.subtext.c_str(), item.flags, (void *)i++);
+ {
+ UINT32 flags = 0;
+ if(item.flags == "off")
+ flags = 32;
+ else if(item.flags == "l")
+ flags = 1;
+ else if(item.flags == "r")
+ flags = 2;
+ else if(item.flags == "lr")
+ flags = 3;
+
+ item_append(item.text.c_str(), item.subtext.c_str(), flags, (void *)i++);
+ }
item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
- global_free(&menu_list);
}
ui_menu_plugin_opt::~ui_menu_plugin_opt()