aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/guiFormSpecMenu.cpp2
-rw-r--r--src/guiLuaApi.cpp7
2 files changed, 4 insertions, 5 deletions
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 1a99d696b..a67768deb 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -1010,7 +1010,7 @@ void GUIFormSpecMenu::parseTextArea(parserData* data,std::vector<std::string>& p
}
void GUIFormSpecMenu::parseField(parserData* data,std::string element,std::string type) {
- std::vector<std::string> parts = split(element,';');
+ std::vector<std::string> parts = split(element,';',true);
if (parts.size() == 3) {
parseSimpleField(data,parts);
diff --git a/src/guiLuaApi.cpp b/src/guiLuaApi.cpp
index b4effbdd3..4ed5cb24c 100644
--- a/src/guiLuaApi.cpp
+++ b/src/guiLuaApi.cpp
@@ -807,9 +807,8 @@ int guiLuaApi::l_set_topleft_text(lua_State *L)
/******************************************************************************/
int guiLuaApi::l_get_modpath(lua_State *L)
{
- //TODO this path may be controversial!
std::string modpath
- = fs::RemoveRelativePathComponents(porting::path_share + DIR_DELIM + "mods" + DIR_DELIM);
+ = fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM + "mods" + DIR_DELIM);
lua_pushstring(L, modpath.c_str());
return 1;
}
@@ -818,7 +817,7 @@ int guiLuaApi::l_get_modpath(lua_State *L)
int guiLuaApi::l_get_gamepath(lua_State *L)
{
std::string gamepath
- = fs::RemoveRelativePathComponents(porting::path_share + DIR_DELIM + "games" + DIR_DELIM);
+ = fs::RemoveRelativePathComponents(porting::path_share + DIR_DELIM + "games" + DIR_DELIM);
lua_pushstring(L, gamepath.c_str());
return 1;
}
@@ -1009,7 +1008,7 @@ bool guiLuaApi::isMinetestPath(std::string path) {
return true;
/* mods */
- if (fs::PathStartsWith(path,fs::RemoveRelativePathComponents(porting::path_share + DIR_DELIM + "mods")))
+ if (fs::PathStartsWith(path,fs::RemoveRelativePathComponents(porting::path_user + DIR_DELIM + "mods")))
return true;
/* worlds */