sfence
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix world deletion (#7494) 

* Fix world deletion
master
Vitaliy 2018-06-30 16:13:53 +03:00 committed by Loïc Blot
parent f3b7be97fe
commit 9f19b7d936
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/script/lua_api/l_mainmenu.cpp
View File

@ -594,31 +594,18 @@ int ModApiMainMenu::l_create_world(lua_State *L)
/******************************************************************************/ /******************************************************************************/
int ModApiMainMenu::l_delete_world(lua_State *L) int ModApiMainMenu::l_delete_world(lua_State *L)
{ {
int worldidx = luaL_checkinteger(L,1) -1; int world_id = luaL_checkinteger(L, 1) - 1;
std::vector<WorldSpec> worlds = getAvailableWorlds(); std::vector<WorldSpec> worlds = getAvailableWorlds();
if (world_id < 0 || world_id >= (int) worlds.size()) {
if ((worldidx >= 0) &&
(worldidx < (int) worlds.size())) {
WorldSpec spec = worlds[worldidx];
std::vector<std::string> paths;
paths.push_back(spec.path);
fs::GetRecursiveSubPaths(spec.path, paths, true);
// Delete files
if (!fs::DeletePaths(paths)) {
lua_pushstring(L, "Failed to delete world");
}
else {
lua_pushnil(L);
}
}
else {
lua_pushstring(L, "Invalid world index"); lua_pushstring(L, "Invalid world index");
return 1;
} }
return 1; const WorldSpec &spec = worlds[world_id];
if (!fs::RecursiveDelete(spec.path)) {
lua_pushstring(L, "Failed to delete world");
return 1;
}
return 0;
} }
/******************************************************************************/ /******************************************************************************/