diff options
author | kwolekr <kwolekr@minetest.net> | 2014-12-29 21:44:52 -0500 |
---|---|---|
committer | kwolekr <kwolekr@minetest.net> | 2014-12-29 21:44:52 -0500 |
commit | 0974337804bde705544b9d237df57f92d5ea5253 (patch) | |
tree | 1708b665f02f32f5f5fc34116708b3b90a567d21 /src/emerge.cpp | |
parent | ca89e63b27a2548a7615fcf4943c22f88818f6eb (diff) | |
download | minetest-0974337804bde705544b9d237df57f92d5ea5253.tar.gz minetest-0974337804bde705544b9d237df57f92d5ea5253.tar.bz2 minetest-0974337804bde705544b9d237df57f92d5ea5253.zip |
Mapgen: Use getBlockSeed2() for blockseeds (much better uniformity)
Diffstat (limited to 'src/emerge.cpp')
-rw-r--r-- | src/emerge.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/emerge.cpp b/src/emerge.cpp index aa2c3c531..8da1a2bfd 100644 --- a/src/emerge.cpp +++ b/src/emerge.cpp @@ -325,15 +325,6 @@ bool EmergeManager::isBlockUnderground(v3s16 blockpos) } -u32 EmergeManager::getBlockSeed(v3s16 p) -{ - return (u32)(params.seed & 0xFFFFFFFF) + - p.Z * 38134234 + - p.Y * 42123 + - p.X * 23; -} - - void EmergeManager::getMapgenNames(std::list<const char *> &mgnames) { for (u32 i = 0; i != ARRLEN(reg_mapgens); i++) @@ -547,7 +538,7 @@ void *EmergeThread::Thread() VoxelArea(minp, maxp)); try { // takes about 90ms with -O1 on an e3-1230v2 m_server->getScriptIface()->environment_OnGenerated( - minp, maxp, emerge->getBlockSeed(minp)); + minp, maxp, mapgen->blockseed); } catch(LuaError &e) { m_server->setAsyncFatalError(e.what()); } |