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

Mainmenu: Properly sort mods and games (#12758)

Browse source 
This also removes trivial and unused pkgmgr functions
Fixes a bug caused by sorting in 2133fc8
This commit is contained in:
SmallJoker 2022-09-12 19:24:54 +02:00 • committed by GitHub
parent fe13f9dfd1
commit bc3dccca5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 54 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -522,8 +522,8 @@ int ModApiMainMenu::l_show_keys_menu(lua_State *L)
/******************************************************************************/
int ModApiMainMenu::l_create_world(lua_State *L)
{
const char *name = luaL_checkstring(L, 1);
int gameidx = luaL_checkinteger(L,2) -1;
const char *name = luaL_checkstring(L, 1);
const char *gameid = luaL_checkstring(L, 2);
StringMap use_settings;
luaL_checktype(L, 3, LUA_TTABLE);
@ -540,8 +540,11 @@ int ModApiMainMenu::l_create_world(lua_State *L)
+ sanitizeDirName(name, "world_");
std::vector<SubgameSpec> games = getAvailableGames();
if (gameidx < 0 || gameidx >= (int) games.size()) {
lua_pushstring(L, "Invalid game index");
auto game_it = std::find_if(games.begin(), games.end(), [gameid] (const SubgameSpec &spec) {
return spec.id == gameid;
});
if (game_it == games.end()) {
lua_pushstring(L, "Game ID not found");
return 1;
}
@ -556,7 +559,7 @@ int ModApiMainMenu::l_create_world(lua_State *L)
// Create world if it doesn't exist
try {
loadGameConfAndInitWorld(path, name, games[gameidx], true);
loadGameConfAndInitWorld(path, name, *game_it, true);
lua_pushnil(L);
} catch (const BaseException &e) {
auto err = std::string("Failed to initialize world: ") + e.what();