Fix MSVC compatibility

[dragonfireclient.git] / src / mg_decoration.cpp

diff --git a/src/mg_decoration.cpp b/src/mg_decoration.cpp
index 50e8fb05a65f31eec9a71f203445e84d55d33040..460db1edea91a4d8e8065751eb12df9c1edc1607 100644 (file)
--- a/src/mg_decoration.cpp
+++ b/src/mg_decoration.cpp
@@ -25,12 +25,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "util/numeric.h"
 
-const char *DecorationManager::ELEMENT_TITLE = "decoration";
-
 FlagDesc flagdesc_deco[] = {
        {"place_center_x", DECO_PLACE_CENTER_X},
        {"place_center_y", DECO_PLACE_CENTER_Y},
        {"place_center_z", DECO_PLACE_CENTER_Z},
+       {"force_placement", DECO_FORCE_PLACEMENT},
        {NULL,             0}
 };
 
@@ -39,38 +38,29 @@ FlagDesc flagdesc_deco[] = {
 
 
 DecorationManager::DecorationManager(IGameDef *gamedef) :
-       GenElementManager(gamedef)
+       ObjDefManager(gamedef, OBJDEF_DECORATION)
 {
 }
 
 
-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;
 
-       for (size_t i = 0; i != m_elements.size(); i++) {
-               Decoration *deco = (Decoration *)m_elements[i];
+       for (size_t i = 0; i != m_objects.size(); i++) {
+               Decoration *deco = (Decoration *)m_objects[i];
                if (!deco)
                        continue;
 
-               nplaced += deco->placeDeco(mg, seed, nmin, nmax);
-               seed++;
+               nplaced += deco->placeDeco(mg, blockseed, nmin, nmax);
+               blockseed++;
        }
 
        return nplaced;
 }
 
 
-void DecorationManager::clear()
-{
-       for (size_t i = 0; i < m_elements.size(); i++) {
-               Decoration *deco = (Decoration *)m_elements[i];
-               delete deco;
-       }
-       m_elements.clear();
-}
-
-
 ///////////////////////////////////////////////////////////////////////////////
 
 
@@ -88,9 +78,9 @@ Decoration::~Decoration()
 }
 
 
-void Decoration::resolveNodeNames(NodeResolveInfo *nri)
+void Decoration::resolveNodeNames()
 {
-       m_ndef->getIdsFromResolveInfo(nri, c_place_on);
+       getIdsFromNrBacklog(&c_place_on);
 }
 
 
@@ -139,13 +129,13 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
                        s16 y = mg->heightmap ?
                                        mg->heightmap[mapindex] :
                                        mg->findGroundLevel(v2s16(x, z), nmin.Y, nmax.Y);
+                       y = MYMAX(y, mg->water_level);
 
-                       if (y < nmin.Y || y > nmax.Y)
+                       if (y < nmin.Y || y > nmax.Y ||
+                               y < y_min  || y > y_max)
                                continue;
 
-                       int height = getHeight();
-                       int max_y = nmax.Y;// + MAP_BLOCKSIZE - 1;
-                       if (y + 1 + height > max_y) {
+                       if (y + getHeight() >= mg->vm->m_area.MaxEdge.Y) {
                                continue;
 #if 0
                                printf("Decoration at (%d %d %d) cut off\n", x, y, z);
@@ -166,8 +156,8 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
                        }
 
                        v3s16 pos(x, y, z);
-                       if (generate(mg, &ps, max_y, pos))
-                               mg->gennotify.addEvent(GENNOTIFY_DECORATION, pos, id);
+                       if (generate(mg->vm, &ps, pos))
+                               mg->gennotify.addEvent(GENNOTIFY_DECORATION, pos, index);
                }
        }
 
@@ -232,15 +222,15 @@ void Decoration::placeCutoffs(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
 ///////////////////////////////////////////////////////////////////////////////
 
 
-void DecoSimple::resolveNodeNames(NodeResolveInfo *nri)
+void DecoSimple::resolveNodeNames()
 {
-       Decoration::resolveNodeNames(nri);
-       m_ndef->getIdsFromResolveInfo(nri, c_decos);
-       m_ndef->getIdsFromResolveInfo(nri, c_spawnby);
+       Decoration::resolveNodeNames();
+       getIdsFromNrBacklog(&c_decos);
+       getIdsFromNrBacklog(&c_spawnby);
 }
 
 
-bool DecoSimple::canPlaceDecoration(ManualMapVoxelManipulator *vm, v3s16 p)
+bool DecoSimple::canPlaceDecoration(MMVManip *vm, v3s16 p)
 {
        // Don't bother if there aren't any decorations to place
        if (c_decos.size() == 0)
@@ -285,10 +275,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, v3s16 p)
 {
-       ManualMapVoxelManipulator *vm = mg->vm;
-
        if (!canPlaceDecoration(vm, p))
                return 0;
 
@@ -297,8 +285,6 @@ size_t DecoSimple::generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, v3s16 p)
        s16 height = (deco_height_max > 0) ?
                pr->range(deco_height, deco_height_max) : deco_height;
 
-       height = MYMIN(height, max_y - p.Y);
-
        v3s16 em = vm->m_area.getExtent();
        u32 vi = vm->m_area.index(p);
        for (int i = 0; i < height; i++) {
@@ -324,26 +310,37 @@ int DecoSimple::getHeight()
 ///////////////////////////////////////////////////////////////////////////////
 
 
-size_t DecoSchematic::generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, v3s16 p)
+DecoSchematic::DecoSchematic()
 {
-       ManualMapVoxelManipulator *vm = mg->vm;
+       schematic = NULL;
+}
 
-       if (flags & DECO_PLACE_CENTER_X)
-               p.X -= (schematic->size.X + 1) / 2;
-       if (flags & DECO_PLACE_CENTER_Y)
-               p.Y -= (schematic->size.Y + 1) / 2;
-       if (flags & DECO_PLACE_CENTER_Z)
-               p.Z -= (schematic->size.Z + 1) / 2;
+
+size_t DecoSchematic::generate(MMVManip *vm, PseudoRandom *pr, v3s16 p)
+{
+       // Schematic could have been unloaded but not the decoration
+       // In this case generate() does nothing (but doesn't *fail*)
+       if (schematic == NULL)
+               return 0;
 
        u32 vi = vm->m_area.index(p);
        content_t c = vm->m_data[vi].getContent();
        if (!CONTAINS(c_place_on, c))
                return 0;
 
+       if (flags & DECO_PLACE_CENTER_X)
+               p.X -= (schematic->size.X - 1) / 2;
+       if (flags & DECO_PLACE_CENTER_Y)
+               p.Y -= (schematic->size.Y - 1) / 2;
+       if (flags & DECO_PLACE_CENTER_Z)
+               p.Z -= (schematic->size.Z - 1) / 2;
+
        Rotation rot = (rotation == ROTATE_RAND) ?
                (Rotation)pr->range(ROTATE_0, ROTATE_270) : rotation;
 
-       schematic->blitToVManip(p, vm, rot, false, mg->ndef);
+       bool force_placement = (flags & DECO_FORCE_PLACEMENT);
+
+       schematic->blitToVManip(p, vm, rot, force_placement, m_ndef);
 
        return 1;
 }