From c951ce3b7cd80b27f09c02e71e63e1ba57b8c0dd Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Tue, 14 Dec 2010 02:24:00 +0200
Subject: [PATCH] little fixes
---
makepackage_binary.sh | 1 +
minetest.conf.example | 6 +++---
src/main.cpp | 1 -
src/voxel.cpp | 11 ++++-------
4 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/makepackage_binary.sh b/makepackage_binary.sh
index b8a5e81af..1eef35616 100755
--- 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 a193a8aac..21ce10721 100644
--- 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 3424266ef..8420ca9e0 100644
--- 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:
======================================================================
-TODO: A mapper to map contents to tile names (for each side)
======================================================================
diff --git a/src/voxel.cpp b/src/voxel.cpp
index 3df29dc68..6412957b2 100644
--- 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;*/
}
--
GitLab