little fixes

diff --git a/makepackage_binary.sh b/makepackage_binary.sh
index b8a5e81af4b0a7a26992b9a34e36e43272e47f65..1eef35616e472221e231a572c0d4181fc587729d 100755 (executable)
--- a/makepackage_binary.sh
+++ b/makepackage_binary.sh
@@ -13,6 +13,7 @@ cp minetest.conf.example $PACKAGEPATH/
 
 cp bin/minetest.exe $PACKAGEPATH/bin/
 cp bin/Irrlicht.dll $PACKAGEPATH/bin/
+cp bin/zlibwapi.dll $PACKAGEPATH/bin/
 #cp bin/test $PACKAGEPATH/bin/
 cp bin/fasttest $PACKAGEPATH/bin/
 cp ../irrlicht/irrlicht-1.7.1/lib/Linux/libIrrlicht.a $PACKAGEPATH/bin/

diff --git a/minetest.conf.example b/minetest.conf.example
index a193a8aac842d8319cb85628d4665db78caa9a81..21ce1072160fc26cf447b95c3dba52fcf973189c 100644 (file)
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -36,10 +36,10 @@
 # H=slope.dot(pos^power):
 #     power <height> <slope.X> <slope.Y> <power>
 
-#mapgen_heightmap_blocksize = 64
-#height_randmax = constant 70.0
+#mapgen_heightmap_blocksize = 32
+#height_randmax = constant 50.0
 #height_randfactor = constant 0.6
-#height_base = linear 0 35 0
+#height_base = linear 0 0 0
 #plants_amount = 1.0
 #ravines_amount = 1.0
 

diff --git a/src/main.cpp b/src/main.cpp
index 3424266ef47495a59cbb9e4dc1473860d8512a26..8420ca9e03ce60d25438138a7d557f2f42719061 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -187,7 +187,6 @@ SUGG: Signs could be done in the same way as torches. For this, blocks
 Doing now:\r
 ======================================================================\r
 \r
-TODO: A mapper to map contents to tile names (for each side)\r
 \r
 ======================================================================\r
 \r

diff --git a/src/voxel.cpp b/src/voxel.cpp
index 3df29dc6838e4df789eadf10e8e9819f6f9779fd..6412957b2feebead213612b28215eda08fc4bd1f 100644 (file)
--- a/src/voxel.cpp
+++ b/src/voxel.cpp
@@ -875,11 +875,10 @@ void VoxelManipulator::flowWater(
                return;
        }
 
-       TimeTaker timer1("flowWater (active_nodes)", g_device);
+       //TimeTaker timer1("flowWater (active_nodes)", g_device);
 
-       dstream<<"active_nodes.size() = "<<active_nodes.size()<<std::endl;
+       //dstream<<"active_nodes.size() = "<<active_nodes.size()<<std::endl;
 
-       //int counter = 0;
 
        u32 stoptime = 0;
        if(g_device != NULL)
@@ -951,23 +950,21 @@ void VoxelManipulator::flowWater(
                //dstream<<"getWaterPressure ProcessingLimitException"<<std::endl;
        }
        
-       v3s16 e = m_area.getExtent();
+       /*v3s16 e = m_area.getExtent();
        s32 v = m_area.getVolume();
-       //dstream<<"flowWater (active): moved "<<counter<<" nodes, "
        dstream<<"flowWater (active): "
                        <<"area ended up as "
                        <<e.X<<"x"<<e.Y<<"x"<<e.Z<<" = "<<v
                        <<", handled a_node count: "<<handled_count
                        <<", active_nodes.size() = "<<active_nodes.size()
                        <<std::endl;
-                       
        dstream<<"addarea_time: "<<addarea_time
                        <<", emerge_time: "<<emerge_time
                        <<", emerge_load_time: "<<emerge_load_time
                        <<", clearflag_time: "<<clearflag_time
                        <<", flowwater_pre_time: "<<flowwater_pre_time
                        <<", updateareawaterpressure_time: "<<updateareawaterpressure_time
-                       <<std::endl;
+                       <<std::endl;*/
 }