diff options
| author | sapier <Sapier at GMX dot net> | 2013-07-12 21:56:09 +0200 |
|---|---|---|
| committer | PilzAdam <pilzadam@minetest.net> | 2013-07-12 22:46:27 +0200 |
| commit | 494fa0c81a7539627505b8f68107ae765bf016d8 (patch) | |
| tree | 6a736a80c6b6bb33c7ea3bd573422dc8aa025521 /src | |
| parent | 7dbbbfc665e285cc9eb9d750c3a449d7da178d4f (diff) | |
| download | hax-minetest-server-494fa0c81a7539627505b8f68107ae765bf016d8.tar.gz hax-minetest-server-494fa0c81a7539627505b8f68107ae765bf016d8.zip | |
Remove lots of debug output from modmgr
Fix RUN_IN_PLACE=0 mod install (now mods are saved in user folder in that case)
Fix text of field element not unescaped correctly
Diffstat (limited to 'src')
| -rw-r--r-- | src/guiFormSpecMenu.cpp | 2 | ||||
| -rw-r--r-- | src/guiLuaApi.cpp | 7 |
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 */ |