drawing range updater update and myrand() (but not usage of it)

[dragonfireclient.git] / src / voxel.h

diff --git a/src/voxel.h b/src/voxel.h
index 74c0a00e5dc5b0198ea9d1a7d09a89b4bc82eae3..a90fc37e8d8435af1d02e1e433b05bc6e66b675a 100644 (file)
--- a/src/voxel.h
+++ b/src/voxel.h
@@ -25,6 +25,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "debug.h"
 #include "mapnode.h"
 
+// For VC++
+#undef min
+#undef max
+
 /*
        A fast voxel manipulator class
 
@@ -428,8 +432,8 @@ class VoxelManipulator /*: public NodeContainer*/
        bool flowWater(v3s16 removed_pos,
                        core::map<v3s16, u8> &active_nodes,
                        int recursion_depth=0,
-                       bool debugprint=false, int *counter=NULL,
-                       int counterlimit=-1
+                       bool debugprint=false,
+                       u32 stoptime=0
        );
 
        /*
@@ -446,7 +450,7 @@ class VoxelManipulator /*: public NodeContainer*/
        void flowWater(core::map<v3s16, u8> &active_nodes,
                        int recursion_depth=0,
                        bool debugprint=false,
-                       int counterlimit=-1
+                       u32 timelimit=50
        );
 
        /*
@@ -460,7 +464,7 @@ class VoxelManipulator /*: public NodeContainer*/
 
                If not found from source, add with VOXELFLAG_INEXISTENT
        */
-       virtual void emerge(VoxelArea a)
+       virtual void emerge(VoxelArea a, s32 caller_id=-1)
        {
                //dstream<<"emerge p=("<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;
                addArea(a);
@@ -502,6 +506,12 @@ class VoxelManipulator /*: public NodeContainer*/
        //TODO: Would these make any speed improvement?
        //bool m_pressure_route_valid;
        //v3s16 m_pressure_route_surface;
+
+       /*
+               Some settings
+       */
+       bool m_disable_water_climb;
+
 private:
 };