aboutsummaryrefslogtreecommitdiff
path: root/src/guiLuaApi.cpp
diff options
context:
space:
mode:
authorsapier <Sapier at GMX dot net>2013-07-12 21:56:09 +0200
committerPilzAdam <pilzadam@minetest.net>2013-07-12 22:46:27 +0200
commit494fa0c81a7539627505b8f68107ae765bf016d8 (patch)
tree6a736a80c6b6bb33c7ea3bd573422dc8aa025521 /src/guiLuaApi.cpp
parent7dbbbfc665e285cc9eb9d750c3a449d7da178d4f (diff)
downloadminetest-494fa0c81a7539627505b8f68107ae765bf016d8.tar.gz
minetest-494fa0c81a7539627505b8f68107ae765bf016d8.tar.bz2
minetest-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/guiLuaApi.cpp')
-rw-r--r--src/guiLuaApi.cpp7
1 files changed, 3 insertions, 4 deletions
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 */