diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/guiFormSpecMenu.cpp | 3 | ||||
| -rw-r--r-- | src/guiLuaApi.cpp | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index abe519798..1a99d696b 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -611,7 +611,7 @@ void GUIFormSpecMenu::parseTextList(parserData* data,std::string element) { std::vector<std::string> v_pos = split(parts[0],','); std::vector<std::string> v_geom = split(parts[1],','); std::string name = parts[2]; - std::vector<std::string> items = split(parts[3],','); + std::vector<std::string> items = split(parts[3],',',true); std::string str_initial_selection = ""; std::string str_transparent = "false"; @@ -1352,6 +1352,7 @@ void GUIFormSpecMenu::parseBox(parserData* data,std::string element) { } void GUIFormSpecMenu::parseElement(parserData* data,std::string element) { + //some prechecks if (element == "") return; diff --git a/src/guiLuaApi.cpp b/src/guiLuaApi.cpp index bc02c062d..b4effbdd3 100644 --- a/src/guiLuaApi.cpp +++ b/src/guiLuaApi.cpp @@ -197,12 +197,14 @@ int guiLuaApi::l_start(lua_State *L) bool valid = false; - engine->m_data->selected_world = getIntegerData(L, "selected_world",valid) -1; + engine->m_data->selected_world = getIntegerData(L, "selected_world",valid) -1; engine->m_data->simple_singleplayer_mode = getBoolData(L,"singleplayer",valid); - engine->m_data->name = getTextData(L,"playername"); - engine->m_data->password = getTextData(L,"password"); - engine->m_data->address = getTextData(L,"address"); - engine->m_data->port = getTextData(L,"port"); + engine->m_data->name = getTextData(L,"playername"); + engine->m_data->password = getTextData(L,"password"); + engine->m_data->address = getTextData(L,"address"); + engine->m_data->port = getTextData(L,"port"); + engine->m_data->serverdescription = getTextData(L,"serverdescription"); + engine->m_data->servername = getTextData(L,"servername"); //close menu next time engine->m_startgame = true; |