oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Organize builtin into subdirectories

Browse source
This commit is contained in:
ShadowNinja 2014-04-27 17:55:49 -04:00
parent fef2729fd0
commit 1cd512913e
44 changed files with 206 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/script/lua_api/l_mainmenu.cpp
View file

@ -885,7 +885,7 @@ int ModApiMainMenu::l_extract_zip(lua_State *L)
}
/******************************************************************************/
int ModApiMainMenu::l_get_scriptdir(lua_State *L)
int ModApiMainMenu::l_get_mainmenu_path(lua_State *L)
{
GUIEngine* engine = getGuiEngine(L);
assert(engine != 0);
@ -1077,7 +1077,7 @@ void ModApiMainMenu::Initialize(lua_State *L, int top)
API_FCT(delete_dir);
API_FCT(copy_dir);
API_FCT(extract_zip);
API_FCT(get_scriptdir);
API_FCT(get_mainmenu_path);
API_FCT(show_file_open_dialog);
API_FCT(get_version);
API_FCT(download_file);

2
src/script/lua_api/l_mainmenu.h
View file

@ -107,7 +107,7 @@ private:
//filesystem
static int l_get_scriptdir(lua_State *L);
static int l_get_mainmenu_path(lua_State *L);
static int l_get_modpath(lua_State *L);

8
src/script/lua_api/l_server.cpp
View file

@ -350,14 +350,8 @@ int ModApiServer::l_get_modpath(lua_State *L)
{
NO_MAP_LOCK_REQUIRED;
std::string modname = luaL_checkstring(L, 1);
// Do it
if(modname == "__builtin"){
std::string path = getServer(L)->getBuiltinLuaPath();
lua_pushstring(L, path.c_str());
return 1;
}
const ModSpec *mod = getServer(L)->getModSpec(modname);
if(!mod){
if (!mod) {
lua_pushnil(L);
return 1;
}

14
src/script/lua_api/l_util.cpp
View file

@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "common/c_content.h"
#include "cpp_api/s_async.h"
#include "debug.h"
#include "porting.h"
#include "log.h"
#include "tool.h"
#include "settings.h"
@ -274,6 +275,14 @@ int ModApiUtil::l_is_yes(lua_State *L)
return 1;
}
int ModApiUtil::l_get_builtin_path(lua_State *L)
{
std::string path = porting::path_share + DIR_DELIM + "builtin";
lua_pushstring(L, path.c_str());
return 1;
}
void ModApiUtil::Initialize(lua_State *L, int top)
{
API_FCT(debug);
@ -294,6 +303,8 @@ void ModApiUtil::Initialize(lua_State *L, int top)
API_FCT(get_password_hash);
API_FCT(is_yes);
API_FCT(get_builtin_path);
}
void ModApiUtil::InitializeAsync(AsyncEngine& engine)
@ -311,4 +322,7 @@ void ModApiUtil::InitializeAsync(AsyncEngine& engine)
ASYNC_API_FCT(write_json);
ASYNC_API_FCT(is_yes);
ASYNC_API_FCT(get_builtin_path);
}

3
src/script/lua_api/l_util.h
View file

@ -79,6 +79,9 @@ private:
// is_yes(arg)
static int l_is_yes(lua_State *L);
// get_scriptdir()
static int l_get_builtin_path(lua_State *L);
public:
static void Initialize(lua_State *L, int top);