Replace std::list by std::vector into ClientMap::updateDrawList, Map::timerUpdate...

[minetest.git] / src / mg_ore.cpp

diff --git a/src/mg_ore.cpp b/src/mg_ore.cpp
index 7d1a38e1d61ce73f864cc70bd59be3b75e70ae77..c62f05860edb72078c98bfcb2e88630d75b2df9c 100644 (file)
--- a/src/mg_ore.cpp
+++ b/src/mg_ore.cpp
@@ -123,8 +123,8 @@ size_t Ore::placeOre(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
 ///////////////////////////////////////////////////////////////////////////////
 
 
-void OreScatter::generate(ManualMapVoxelManipulator *vm, int mapseed,
-       u32 blockseed, v3s16 nmin, v3s16 nmax)
+void OreScatter::generate(MMVManip *vm, int mapseed, u32 blockseed,
+       v3s16 nmin, v3s16 nmax)
 {
        PseudoRandom pr(blockseed);
        MapNode n_ore(c_ore, 0, ore_param2);
@@ -164,8 +164,8 @@ void OreScatter::generate(ManualMapVoxelManipulator *vm, int mapseed,
 ///////////////////////////////////////////////////////////////////////////////
 
 
-void OreSheet::generate(ManualMapVoxelManipulator *vm, int mapseed,
-       u32 blockseed, v3s16 nmin, v3s16 nmax)
+void OreSheet::generate(MMVManip *vm, int mapseed, u32 blockseed,
+       v3s16 nmin, v3s16 nmax)
 {
        PseudoRandom pr(blockseed + 4234);
        MapNode n_ore(c_ore, 0, ore_param2);
@@ -206,8 +206,8 @@ void OreSheet::generate(ManualMapVoxelManipulator *vm, int mapseed,
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void OreBlob::generate(ManualMapVoxelManipulator *vm, int mapseed,
-       u32 blockseed, v3s16 nmin, v3s16 nmax)
+void OreBlob::generate(MMVManip *vm, int mapseed, u32 blockseed,
+       v3s16 nmin, v3s16 nmax)
 {
        PseudoRandom pr(blockseed + 2404);
        MapNode n_ore(c_ore, 0, ore_param2);
@@ -263,14 +263,20 @@ void OreBlob::generate(ManualMapVoxelManipulator *vm, int mapseed,
 
 ///////////////////////////////////////////////////////////////////////////////
 
+OreVein::OreVein()
+{
+       noise2 = NULL;
+}
+
+
 OreVein::~OreVein()
 {
        delete noise2;
 }
 
 
-void OreVein::generate(ManualMapVoxelManipulator *vm, int mapseed,
-       u32 blockseed, v3s16 nmin, v3s16 nmax)
+void OreVein::generate(MMVManip *vm, int mapseed, u32 blockseed,
+       v3s16 nmin, v3s16 nmax)
 {
        PseudoRandom pr(blockseed + 520);
        MapNode n_ore(c_ore, 0, ore_param2);