diff options
| author | kwolekr <kwolekr@minetest.net> | 2015-03-30 23:40:35 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2015-03-31 01:11:51 -0400 |
| commit | ed10005d381580440558dc49277b4d350f081283 (patch) | |
| tree | a1ac2b831d883f6c43193a1c2a55860bf7e0d6ed /src/mg_ore.cpp | |
| parent | 6a48844eba16fb955ef4992bef539af66c595d0c (diff) | |
| download | minetest-ed10005d381580440558dc49277b4d350f081283.tar.gz minetest-ed10005d381580440558dc49277b4d350f081283.tar.bz2 minetest-ed10005d381580440558dc49277b4d350f081283.zip | |
GenElementManager: Pass opaque handles to Lua and rename to ObjDefManager
Add core.clear_registered_schematics() and refactor schematics somewhat
Diffstat (limited to 'src/mg_ore.cpp')
| -rw-r--r-- | src/mg_ore.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/mg_ore.cpp b/src/mg_ore.cpp index 850f25516..e7e062c69 100644 --- a/src/mg_ore.cpp +++ b/src/mg_ore.cpp @@ -24,8 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "map.h" #include "log.h" -const char *OreManager::ELEMENT_TITLE = "ore"; - FlagDesc flagdesc_ore[] = { {"absheight", OREFLAG_ABSHEIGHT}, {NULL, 0} @@ -36,7 +34,7 @@ FlagDesc flagdesc_ore[] = { OreManager::OreManager(IGameDef *gamedef) : - GenElementManager(gamedef) + ObjDefManager(gamedef, OBJDEF_ORE) { } @@ -45,8 +43,8 @@ size_t OreManager::placeAllOres(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nma { size_t nplaced = 0; - for (size_t i = 0; i != m_elements.size(); i++) { - Ore *ore = (Ore *)m_elements[i]; + for (size_t i = 0; i != m_objects.size(); i++) { + Ore *ore = (Ore *)m_objects[i]; if (!ore) continue; @@ -60,11 +58,11 @@ size_t OreManager::placeAllOres(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nma void OreManager::clear() { - for (size_t i = 0; i < m_elements.size(); i++) { - Ore *ore = (Ore *)m_elements[i]; + for (size_t i = 0; i < m_objects.size(); i++) { + Ore *ore = (Ore *)m_objects[i]; delete ore; } - m_elements.clear(); + m_objects.clear(); } |