aboutsummaryrefslogtreecommitdiff
path: root/src/server.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-03-01 01:32:54 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-03-01 01:32:54 +0200
commit9a22d02903549c09f059b12f0ec06ea12a19abbb (patch)
tree62ef962047b8ced9dd65c3f8157eb2713ec818e8 /src/server.cpp
parentf923c1fb6618988c24016bd5a2aa4f3cebb30214 (diff)
downloadminetest-9a22d02903549c09f059b12f0ec06ea12a19abbb.tar.gz
minetest-9a22d02903549c09f059b12f0ec06ea12a19abbb.tar.bz2
minetest-9a22d02903549c09f059b12f0ec06ea12a19abbb.zip
mapgen tweaking
Diffstat (limited to 'src/server.cpp')
-rw-r--r--src/server.cpp18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/server.cpp b/src/server.cpp
index 9171c7966..db9c569eb 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -232,16 +232,18 @@ void * EmergeThread::Thread()
*/
if(lighting_invalidated_blocks.size() > 0)
+ {
dstream<<"lighting "<<lighting_invalidated_blocks.size()
<<" blocks"<<std::endl;
- // 50-100ms for single block generation
- //TimeTaker timer("** EmergeThread updateLighting");
-
- // Update lighting without locking the environment mutex,
- // add modified blocks to changed blocks
- map.updateLighting(lighting_invalidated_blocks, modified_blocks);
-
+ // 50-100ms for single block generation
+ TimeTaker timer("** EmergeThread updateLighting");
+
+ // Update lighting without locking the environment mutex,
+ // add modified blocks to changed blocks
+ map.updateLighting(lighting_invalidated_blocks, modified_blocks);
+ }
+
// Add all from changed_blocks to modified_blocks
for(core::map<v3s16, MapBlock*>::Iterator i = changed_blocks.getIterator();
i.atEnd() == false; i++)
@@ -3411,7 +3413,7 @@ Player *Server::emergePlayer(const char *name, const char *password,
s16 groundheight = 0;
#if 1
// Try to find a good place a few times
- for(s32 i=0; i<500; i++)
+ for(s32 i=0; i<1000; i++)
{
s32 range = 1 + i;
// We're going to try to throw the player to this position