map.cpp: Initialize NodeNeighbor, set NeighborType to u8 & cleanup

Cleanup:
* Drop unused Map::transforming_liquid_size()
* NodeNeighbor must use const ref for v3s16
* Add a missing default in a switch case

diff --git a/src/map.cpp b/src/map.cpp
index 256c542a123383938a756b48a9267ae9aa56bbd5..054338c926653d84d0558797e7ebfd64fa797cc5 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -512,22 +512,22 @@ void Map::PrintInfo(std::ostream &out)
 
 #define WATER_DROP_BOOST 4
 
-enum NeighborType {
+enum NeighborType : u8 {
        NEIGHBOR_UPPER,
        NEIGHBOR_SAME_LEVEL,
        NEIGHBOR_LOWER
 };
+
 struct NodeNeighbor {
        MapNode n;
        NeighborType t;
        v3s16 p;
-       bool l; //can liquid
 
        NodeNeighbor()
-               : n(CONTENT_AIR)
+               : n(CONTENT_AIR), t(NEIGHBOR_SAME_LEVEL)
        { }
 
-       NodeNeighbor(const MapNode &node, NeighborType n_type, v3s16 pos)
+       NodeNeighbor(const MapNode &node, NeighborType n_type, const v3s16 &pos)
                : n(node),
                  t(n_type),
                  p(pos)
@@ -538,10 +538,6 @@ void Map::transforming_liquid_add(v3s16 p) {
         m_transforming_liquid.push_back(p);
 }
 
-s32 Map::transforming_liquid_size() {
-        return m_transforming_liquid.size();
-}
-
 void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks,
                ServerEnvironment *env)
 {
@@ -645,6 +641,8 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks,
                                case 4:
                                        nt = NEIGHBOR_LOWER;
                                        break;
+                               default:
+                                       break;
                        }
                        v3s16 npos = p0 + dirs[i];
                        NodeNeighbor nb(getNodeNoEx(npos), nt, npos);

diff --git a/src/map.h b/src/map.h
index 6b4942b4d319c94203bf5bd8c8b0a672c12238da..5af021e63b1a017dc5f546809a1e89050e64f9ac 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -289,7 +289,6 @@ public:
        */
 
        void transforming_liquid_add(v3s16 p);
-       s32 transforming_liquid_size();
 
        bool isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes);
 protected: