Skip to content
Permalink
Browse files

Hide mapgens from main menu not intended for end users

  • Loading branch information
kwolekr committed Oct 4, 2015
1 parent 0850d3b commit 9f25aba6c2c3a922ebe74c327e275e83fef1f6f6
Showing with 16 additions and 11 deletions.
  1. +2 −2 doc/menu_lua_api.txt
  2. +11 −7 src/emerge.cpp
  3. +2 −1 src/emerge.h
  4. +1 −1 src/script/lua_api/l_mainmenu.cpp
@@ -141,8 +141,8 @@ core.get_game(index)
addon_mods_paths = {[1] = <path>,},
}
core.get_games() -> table of all games in upper format (possible in async calls)
core.get_mapgen_names() -> table of all map generator algorithms registered in
the core (possible in async calls)
core.get_mapgen_names([include_hidden=false]) -> table of map generator algorithms
registered in the core (possible in async calls)

Favorites:
core.get_favorites(location) -> list of favorites (possible in async calls)
@@ -54,6 +54,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
struct MapgenDesc {
const char *name;
MapgenFactory *factory;
bool is_user_visible;
};

class EmergeThread : public Thread {
@@ -100,10 +101,10 @@ class EmergeThread : public Thread {
////

MapgenDesc g_reg_mapgens[] = {
{"v5", new MapgenFactoryV5},
{"v6", new MapgenFactoryV6},
{"v7", new MapgenFactoryV7},
{"singlenode", new MapgenFactorySinglenode},
{"v5", new MapgenFactoryV5, true},
{"v6", new MapgenFactoryV6, true},
{"v7", new MapgenFactoryV7, true},
{"singlenode", new MapgenFactorySinglenode, false},
};

////
@@ -343,10 +344,13 @@ bool EmergeManager::isBlockUnderground(v3s16 blockpos)
}


void EmergeManager::getMapgenNames(std::vector<const char *> *mgnames)
void EmergeManager::getMapgenNames(
std::vector<const char *> *mgnames, bool include_hidden)
{
for (u32 i = 0; i != ARRLEN(g_reg_mapgens); i++)
mgnames->push_back(g_reg_mapgens[i].name);
for (u32 i = 0; i != ARRLEN(g_reg_mapgens); i++) {
if (include_hidden || g_reg_mapgens[i].is_user_visible)
mgnames->push_back(g_reg_mapgens[i].name);
}
}


@@ -139,7 +139,8 @@ class EmergeManager {
bool isBlockUnderground(v3s16 blockpos);

static MapgenFactory *getMapgenFactory(const std::string &mgname);
static void getMapgenNames(std::vector<const char *> *mgnames);
static void getMapgenNames(
std::vector<const char *> *mgnames, bool include_hidden);
static v3s16 getContainingChunk(v3s16 blockpos, s16 chunksize);

private:
@@ -707,7 +707,7 @@ int ModApiMainMenu::l_set_topleft_text(lua_State *L)
int ModApiMainMenu::l_get_mapgen_names(lua_State *L)
{
std::vector<const char *> names;
EmergeManager::getMapgenNames(&names);
EmergeManager::getMapgenNames(&names, lua_toboolean(L, 1));

lua_newtable(L);
for (size_t i = 0; i != names.size(); i++) {

0 comments on commit 9f25aba

Please sign in to comment.