Jordach
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

little fixes

master
Perttu Ahola 2010-12-14 02:24:00 +02:00
parent 3d49c88e81
commit c951ce3b7c
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
makepackage_binary.sh
View File

@ -13,6 +13,7 @@ cp minetest.conf.example $PACKAGEPATH/
cp bin/minetest.exe $PACKAGEPATH/bin/ cp bin/minetest.exe $PACKAGEPATH/bin/
cp bin/Irrlicht.dll $PACKAGEPATH/bin/ cp bin/Irrlicht.dll $PACKAGEPATH/bin/
cp bin/zlibwapi.dll $PACKAGEPATH/bin/
#cp bin/test $PACKAGEPATH/bin/ #cp bin/test $PACKAGEPATH/bin/
cp bin/fasttest $PACKAGEPATH/bin/ cp bin/fasttest $PACKAGEPATH/bin/
cp ../irrlicht/irrlicht-1.7.1/lib/Linux/libIrrlicht.a $PACKAGEPATH/bin/ cp ../irrlicht/irrlicht-1.7.1/lib/Linux/libIrrlicht.a $PACKAGEPATH/bin/

6
minetest.conf.example
View File

@ -36,10 +36,10 @@
# H=slope.dot(pos^power): # H=slope.dot(pos^power):
# power <height> <slope.X> <slope.Y> <power> # power <height> <slope.X> <slope.Y> <power>
#mapgen_heightmap_blocksize = 64 #mapgen_heightmap_blocksize = 32
#height_randmax = constant 70.0 #height_randmax = constant 50.0
#height_randfactor = constant 0.6 #height_randfactor = constant 0.6
#height_base = linear 0 35 0 #height_base = linear 0 0 0
#plants_amount = 1.0 #plants_amount = 1.0
#ravines_amount = 1.0 #ravines_amount = 1.0

1
src/main.cpp
View File

@ -187,7 +187,6 @@ SUGG: Signs could be done in the same way as torches. For this, blocks
Doing now: Doing now:
====================================================================== ======================================================================
TODO: A mapper to map contents to tile names (for each side)
====================================================================== ======================================================================

11
src/voxel.cpp
View File

@ -875,11 +875,10 @@ void VoxelManipulator::flowWater(
return; 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; u32 stoptime = 0;
if(g_device != NULL) if(g_device != NULL)
@ -951,23 +950,21 @@ void VoxelManipulator::flowWater(
//dstream<<"getWaterPressure ProcessingLimitException"<<std::endl; //dstream<<"getWaterPressure ProcessingLimitException"<<std::endl;
} }
v3s16 e = m_area.getExtent(); /*v3s16 e = m_area.getExtent();
s32 v = m_area.getVolume(); s32 v = m_area.getVolume();
//dstream<<"flowWater (active): moved "<<counter<<" nodes, "
dstream<<"flowWater (active): " dstream<<"flowWater (active): "
<<"area ended up as " <<"area ended up as "
<<e.X<<"x"<<e.Y<<"x"<<e.Z<<" = "<<v <<e.X<<"x"<<e.Y<<"x"<<e.Z<<" = "<<v
<<", handled a_node count: "<<handled_count <<", handled a_node count: "<<handled_count
<<", active_nodes.size() = "<<active_nodes.size() <<", active_nodes.size() = "<<active_nodes.size()
<<std::endl; <<std::endl;
dstream<<"addarea_time: "<<addarea_time dstream<<"addarea_time: "<<addarea_time
<<", emerge_time: "<<emerge_time <<", emerge_time: "<<emerge_time
<<", emerge_load_time: "<<emerge_load_time <<", emerge_load_time: "<<emerge_load_time
<<", clearflag_time: "<<clearflag_time <<", clearflag_time: "<<clearflag_time
<<", flowwater_pre_time: "<<flowwater_pre_time <<", flowwater_pre_time: "<<flowwater_pre_time
<<", updateareawaterpressure_time: "<<updateareawaterpressure_time <<", updateareawaterpressure_time: "<<updateareawaterpressure_time
<<std::endl; <<std::endl;*/
} }