luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-14 09:05:19 +02:00
Code Activity

Add minetest.set_noiseparam_defaults() Lua API

Browse Source
This commit is contained in:
kwolekr
2014-02-15 18:20:15 -05:00
parent c873164878
commit 3570f3e396
13 changed files with 368 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/emerge.cpp
View File

@@ -125,15 +125,6 @@ EmergeManager::EmergeManager(IGameDef *gamedef) {
emergethread.push_back(new EmergeThread((Server *)gamedef, i));
infostream << "EmergeManager: using " << nthreads << " threads" << std::endl;
loadParamsFromSettings(g_settings);
if (g_settings->get("fixed_map_seed").empty()) {
params.seed = (((u64)(myrand() & 0xffff) << 0)
| ((u64)(myrand() & 0xffff) << 16)
| ((u64)(myrand() & 0xffff) << 32)
| ((u64)(myrand() & 0xffff) << 48));
}
}
@@ -168,6 +159,18 @@ EmergeManager::~EmergeManager() {
}
void EmergeManager::loadMapgenParams() {
loadParamsFromSettings(g_settings);
if (g_settings->get("fixed_map_seed").empty()) {
params.seed = (((u64)(myrand() & 0xffff) << 0)
| ((u64)(myrand() & 0xffff) << 16)
| ((u64)(myrand() & 0xffff) << 32)
| ((u64)(myrand() & 0xffff) << 48));
}
}
void EmergeManager::initMapgens() {
if (mapgen.size())
return;