Move hex.h to util/

[dragonfireclient.git] / src / mg_decoration.cpp

diff --git a/src/mg_decoration.cpp b/src/mg_decoration.cpp
index 761b231edf10c94374809626ba4c2d9731b28391..a67c3cd8cfd325ce863b5b058f066ba9654bece8 100644 (file)
--- a/src/mg_decoration.cpp
+++ b/src/mg_decoration.cpp
@@ -44,7 +44,8 @@ DecorationManager::DecorationManager(IGameDef *gamedef) :
 }
 
 
-size_t DecorationManager::placeAllDecos(Mapgen *mg, u32 seed, v3s16 nmin, v3s16 nmax)
+size_t DecorationManager::placeAllDecos(Mapgen *mg, u32 blockseed,
+       v3s16 nmin, v3s16 nmax)
 {
        size_t nplaced = 0;
 
@@ -53,8 +54,8 @@ size_t DecorationManager::placeAllDecos(Mapgen *mg, u32 seed, v3s16 nmin, v3s16
                if (!deco)
                        continue;
 
-               nplaced += deco->placeDeco(mg, seed, nmin, nmax);
-               seed++;
+               nplaced += deco->placeDeco(mg, blockseed, nmin, nmax);
+               blockseed++;
        }
 
        return nplaced;
@@ -65,10 +66,7 @@ void DecorationManager::clear()
 {
        for (size_t i = 0; i < m_elements.size(); i++) {
                Decoration *deco = (Decoration *)m_elements[i];
-               if (!deco)
-                       continue;
-
-               deco->dropResolverEntries(m_resolver);
+               delete deco;
        }
        m_elements.clear();
 }
@@ -91,6 +89,12 @@ Decoration::~Decoration()
 }
 
 
+void Decoration::resolveNodeNames(NodeResolveInfo *nri)
+{
+       m_ndef->getIdsFromResolveInfo(nri, c_place_on);
+}
+
+
 size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
 {
        PseudoRandom ps(blockseed + 53);
@@ -137,7 +141,8 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
                                        mg->heightmap[mapindex] :
                                        mg->findGroundLevel(v2s16(x, z), nmin.Y, nmax.Y);
 
-                       if (y < nmin.Y || y > nmax.Y)
+                       if (y < nmin.Y || y > nmax.Y ||
+                               y < y_min  || y > y_max)
                                continue;
 
                        int height = getHeight();
@@ -163,7 +168,7 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
                        }
 
                        v3s16 pos(x, y, z);
-                       if (generate(mg, &ps, max_y, pos))
+                       if (generate(mg->vm, &ps, max_y, pos))
                                mg->gennotify.addEvent(GENNOTIFY_DECORATION, pos, id);
                }
        }
@@ -229,7 +234,15 @@ void Decoration::placeCutoffs(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
 ///////////////////////////////////////////////////////////////////////////////
 
 
-bool DecoSimple::canPlaceDecoration(ManualMapVoxelManipulator *vm, v3s16 p)
+void DecoSimple::resolveNodeNames(NodeResolveInfo *nri)
+{
+       Decoration::resolveNodeNames(nri);
+       m_ndef->getIdsFromResolveInfo(nri, c_decos);
+       m_ndef->getIdsFromResolveInfo(nri, c_spawnby);
+}
+
+
+bool DecoSimple::canPlaceDecoration(MMVManip *vm, v3s16 p)
 {
        // Don't bother if there aren't any decorations to place
        if (c_decos.size() == 0)
@@ -274,10 +287,8 @@ bool DecoSimple::canPlaceDecoration(ManualMapVoxelManipulator *vm, v3s16 p)
 }
 
 
-size_t DecoSimple::generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, v3s16 p)
+size_t DecoSimple::generate(MMVManip *vm, PseudoRandom *pr, s16 max_y, v3s16 p)
 {
-       ManualMapVoxelManipulator *vm = mg->vm;
-
        if (!canPlaceDecoration(vm, p))
                return 0;
 
@@ -310,20 +321,11 @@ int DecoSimple::getHeight()
 }
 
 
-void DecoSimple::dropResolverEntries(NodeResolver *resolver)
-{
-       resolver->cancelNodeList(&c_decos);
-       resolver->cancelNodeList(&c_spawnby);
-}
-
-
 ///////////////////////////////////////////////////////////////////////////////
 
 
-size_t DecoSchematic::generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, v3s16 p)
+size_t DecoSchematic::generate(MMVManip *vm, PseudoRandom *pr, s16 max_y, v3s16 p)
 {
-       ManualMapVoxelManipulator *vm = mg->vm;
-
        if (flags & DECO_PLACE_CENTER_X)
                p.X -= (schematic->size.X + 1) / 2;
        if (flags & DECO_PLACE_CENTER_Y)
@@ -331,6 +333,9 @@ size_t DecoSchematic::generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, v3s16 p)
        if (flags & DECO_PLACE_CENTER_Z)
                p.Z -= (schematic->size.Z + 1) / 2;
 
+       if (!vm->m_area.contains(p))
+               return 0;
+
        u32 vi = vm->m_area.index(p);
        content_t c = vm->m_data[vi].getContent();
        if (!CONTAINS(c_place_on, c))
@@ -339,7 +344,7 @@ size_t DecoSchematic::generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, v3s16 p)
        Rotation rot = (rotation == ROTATE_RAND) ?
                (Rotation)pr->range(ROTATE_0, ROTATE_270) : rotation;
 
-       schematic->blitToVManip(p, vm, rot, false, mg->ndef);
+       schematic->blitToVManip(p, vm, rot, false, m_ndef);
 
        return 1;
 }