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 game-related changes (#11887)

Browse source 
fixes:
* Switching between games does not immediately hide creative mode / damage buttons if so specified
* World creation menu has a game selection list even though the menu already provides a gamebar
* Showing gameid in world list is unnecessary
* Choice of mapgen parameters in menu persists between games (and was half-broken)
This commit is contained in:
sfan5 2022-01-09 21:15:35 +01:00 • committed by GitHub
parent b164e16d1b
commit 4c8c649779
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 262 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -414,25 +414,53 @@ int ModApiMainMenu::l_create_world(lua_State *L)
const char *name = luaL_checkstring(L, 1);
int gameidx = luaL_checkinteger(L,2) -1;
StringMap use_settings;
luaL_checktype(L, 3, LUA_TTABLE);
lua_pushnil(L);
while (lua_next(L, 3) != 0) {
// key at index -2 and value at index -1
use_settings[luaL_checkstring(L, -2)] = luaL_checkstring(L, -1);
lua_pop(L, 1);
}
lua_pop(L, 1);
std::string path = porting::path_user + DIR_DELIM
"worlds" + DIR_DELIM
+ sanitizeDirName(name, "world_");
std::vector<SubgameSpec> games = getAvailableGames();
if ((gameidx >= 0) &&
(gameidx < (int) games.size())) {
// Create world if it doesn't exist
try {
loadGameConfAndInitWorld(path, name, games[gameidx], true);
lua_pushnil(L);
} catch (const BaseException &e) {
lua_pushstring(L, (std::string("Failed to initialize world: ") + e.what()).c_str());
}
} else {
if (gameidx < 0 || gameidx >= (int) games.size()) {
lua_pushstring(L, "Invalid game index");
return 1;
}
// Set the settings for world creation
// this is a bad hack but the best we have right now..
StringMap backup;
for (auto it : use_settings) {
if (g_settings->existsLocal(it.first))
backup[it.first] = g_settings->get(it.first);
g_settings->set(it.first, it.second);
}
// Create world if it doesn't exist
try {
loadGameConfAndInitWorld(path, name, games[gameidx], true);
lua_pushnil(L);
} catch (const BaseException &e) {
auto err = std::string("Failed to initialize world: ") + e.what();
lua_pushstring(L, err.c_str());
}
// Restore previous settings
for (auto it : use_settings) {
auto it2 = backup.find(it.first);
if (it2 == backup.end())
g_settings->remove(it.first); // wasn't set before
else
g_settings->set(it.first, it2->second); // was set before
}
return 1;
}