Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 18:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add minetest.clear_registered_biomes() api

Browse Source
This commit is contained in:
kwolekr 2014-12-06 18:08:08 -05:00
parent f3abaec83b
commit 60feb4ad25
6 changed files with 51 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mapgen.cpp
View File

@ -419,22 +419,17 @@ GenElement *GenElementManager::get(u32 id)
} }
GenElement *GenElementManager::getByName(const char *name) GenElement *GenElementManager::getByName(const std::string &name)
{ {
for (size_t i = 0; i != m_elements.size(); i++) { for (size_t i = 0; i != m_elements.size(); i++) {
GenElement *elem = m_elements[i]; GenElement *elem = m_elements[i];
if (elem && !strcmp(elem->name.c_str(), name)) if (elem && name == elem->name)
return elem; return elem;
} }
return NULL; return NULL;
} }
GenElement *GenElementManager::getByName(std::string &name)
{
return getByName(name.c_str());
}
GenElement *GenElementManager::update(u32 id, GenElement *elem) GenElement *GenElementManager::update(u32 id, GenElement *elem)
{ {
@ -451,3 +446,9 @@ GenElement *GenElementManager::remove(u32 id)
{ {
return update(id, NULL); return update(id, NULL);
} }
void GenElementManager::clear()
{
m_elements.clear();
}

4
src/mapgen.h
View File

@ -181,9 +181,9 @@ public:
virtual GenElement *get(u32 id); virtual GenElement *get(u32 id);
virtual GenElement *update(u32 id, GenElement *elem); virtual GenElement *update(u32 id, GenElement *elem);
virtual GenElement *remove(u32 id); virtual GenElement *remove(u32 id);
virtual void clear();
virtual GenElement *getByName(const char *name); virtual GenElement *getByName(const std::string &name);
virtual GenElement *getByName(std::string &name);
protected: protected:
std::vector<GenElement *> m_elements; std::vector<GenElement *> m_elements;

35
src/mg_biome.cpp
View File

@ -35,11 +35,9 @@ NoiseParams nparams_biome_def_humidity(50, 50, v3f(500.0, 500.0, 500.0), 842, 3,
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
BiomeManager::BiomeManager(IGameDef *gamedef) BiomeManager::BiomeManager(IGameDef *gamedef)
{ {
NodeResolver *resolver = gamedef->getNodeDefManager()->getResolver(); m_resolver = gamedef->getNodeDefManager()->getResolver();
np_heat = &nparams_biome_def_heat; np_heat = &nparams_biome_def_heat;
np_humidity = &nparams_biome_def_humidity; np_humidity = &nparams_biome_def_humidity;
@ -56,12 +54,12 @@ BiomeManager::BiomeManager(IGameDef *gamedef)
b->heat_point = 0.0; b->heat_point = 0.0;
b->humidity_point = 0.0; b->humidity_point = 0.0;
resolver->addNode("air", "", CONTENT_AIR, &b->c_top); m_resolver->addNode("air", "", CONTENT_AIR, &b->c_top);
resolver->addNode("air", "", CONTENT_AIR, &b->c_filler); m_resolver->addNode("air", "", CONTENT_AIR, &b->c_filler);
resolver->addNode("mapgen_stone", "", CONTENT_AIR, &b->c_stone); m_resolver->addNode("mapgen_stone", "", CONTENT_AIR, &b->c_stone);
resolver->addNode("mapgen_water_source", "", CONTENT_AIR, &b->c_water); m_resolver->addNode("mapgen_water_source", "", CONTENT_AIR, &b->c_water);
resolver->addNode("air", "", CONTENT_AIR, &b->c_dust); m_resolver->addNode("air", "", CONTENT_AIR, &b->c_dust);
resolver->addNode("mapgen_water_source", "", CONTENT_AIR, &b->c_dust_water); m_resolver->addNode("mapgen_water_source", "", CONTENT_AIR, &b->c_dust_water);
add(b); add(b);
} }
@ -110,7 +108,24 @@ Biome *BiomeManager::getBiome(float heat, float humidity, s16 y)
biome_closest = b; biome_closest = b;
} }
} }
return biome_closest ? biome_closest : (Biome *)m_elements[0]; return biome_closest ? biome_closest : (Biome *)m_elements[0];
} }
void BiomeManager::clear()
{
for (size_t i = 1; i < m_elements.size(); i++) {
Biome *b = (Biome *)m_elements[i];
if (!b)
continue;
m_resolver->cancelNode(&b->c_top);
m_resolver->cancelNode(&b->c_filler);
m_resolver->cancelNode(&b->c_stone);
m_resolver->cancelNode(&b->c_water);
m_resolver->cancelNode(&b->c_dust);
m_resolver->cancelNode(&b->c_dust_water);
}
m_elements.resize(1);
}

5
src/mg_biome.h
View File

@ -72,9 +72,14 @@ public:
return new Biome; return new Biome;
} }
void clear();
void calcBiomes(s16 sx, s16 sy, float *heat_map, float *humidity_map, void calcBiomes(s16 sx, s16 sy, float *heat_map, float *humidity_map,
s16 *height_map, u8 *biomeid_map); s16 *height_map, u8 *biomeid_map);
Biome *getBiome(float heat, float humidity, s16 y); Biome *getBiome(float heat, float humidity, s16 y);
private:
NodeResolver *m_resolver;
}; };
#endif #endif

8
src/script/lua_api/l_mapgen.cpp
View File

@ -360,6 +360,13 @@ int ModApiMapgen::l_register_biome(lua_State *L)
return 1; return 1;
} }
int ModApiMapgen::l_clear_registered_biomes(lua_State *L)
{
BiomeManager *bmgr = getServer(L)->getEmergeManager()->biomemgr;
bmgr->clear();
return 0;
}
// register_decoration({lots of stuff}) // register_decoration({lots of stuff})
int ModApiMapgen::l_register_decoration(lua_State *L) int ModApiMapgen::l_register_decoration(lua_State *L)
{ {
@ -678,6 +685,7 @@ void ModApiMapgen::Initialize(lua_State *L, int top)
API_FCT(register_biome); API_FCT(register_biome);
API_FCT(register_decoration); API_FCT(register_decoration);
API_FCT(register_ore); API_FCT(register_ore);
API_FCT(clear_registered_biomes);
API_FCT(create_schematic); API_FCT(create_schematic);
API_FCT(place_schematic); API_FCT(place_schematic);

3
src/script/lua_api/l_mapgen.h
View File

@ -52,6 +52,9 @@ private:
// register_ore({lots of stuff}) // register_ore({lots of stuff})
static int l_register_ore(lua_State *L); static int l_register_ore(lua_State *L);
// clear_registered_biomes()
static int l_clear_registered_biomes(lua_State *L);
// create_schematic(p1, p2, probability_list, filename) // create_schematic(p1, p2, probability_list, filename)
static int l_create_schematic(lua_State *L); static int l_create_schematic(lua_State *L);