// if unspecified, leave a proc for the main thread and one for
// some other misc thread
int nthreads = 0;
- if (!g_settings->tryGetS16("num_emerge_threads", nthreads))
+ if (!g_settings->getS16NoEx("num_emerge_threads", nthreads))
nthreads = porting::getNumberOfProcessors() - 2;
if (nthreads < 1)
nthreads = 1;
qlimit_total = g_settings->getU16("emergequeue_limit_total");
- if (!g_settings->tryGetU16("emergequeue_limit_diskonly", qlimit_diskonly))
+ if (!g_settings->getU16NoEx("emergequeue_limit_diskonly", qlimit_diskonly))
qlimit_diskonly = nthreads * 5 + 1;
- if (!g_settings->tryGetU16("emergequeue_limit_generate", qlimit_generate))
+ if (!g_settings->getU16NoEx("emergequeue_limit_generate", qlimit_generate))
qlimit_generate = nthreads + 1;
+ // don't trust user input for something very important like this
+ if (qlimit_total < 1)
+ qlimit_total = 1;
+ if (qlimit_diskonly < 1)
+ qlimit_diskonly = 1;
+ if (qlimit_generate < 1)
+ qlimit_generate = 1;
+
for (int i = 0; i != nthreads; i++)
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));
- }
}
}
+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;
std::string seed_str;
const char *setname = (settings == g_settings) ? "fixed_map_seed" : "seed";
- if (settings->tryGet(setname, seed_str))
+ if (settings->getNoEx(setname, seed_str))
params.seed = read_seed(seed_str.c_str());
- settings->tryGet("mg_name", params.mg_name);
- settings->tryGetS16("water_level", params.water_level);
- settings->tryGetS16("chunksize", params.chunksize);
- settings->tryGetFlagStr("mg_flags", params.flags, flagdesc_mapgen);
+ settings->getNoEx("mg_name", params.mg_name);
+ settings->getS16NoEx("water_level", params.water_level);
+ settings->getS16NoEx("chunksize", params.chunksize);
+ settings->getFlagStrNoEx("mg_flags", params.flags, flagdesc_mapgen);
delete params.sparams;
params.sparams = createMapgenParams(params.mg_name);
if (params.sparams)
params.sparams->readParams(settings);
-
}
settings->setU64("seed", params.seed);
settings->setS16("water_level", params.water_level);
settings->setS16("chunksize", params.chunksize);
- settings->setFlagStr("mg_flags", params.flags, flagdesc_mapgen);
+ settings->setFlagStr("mg_flags", params.flags, flagdesc_mapgen, (u32)-1);
if (params.sparams)
params.sparams->writeParams(settings);
v3s16 last_tried_pos(-32768,-32768,-32768); // For error output
v3s16 p;
- u8 flags;
+ u8 flags = 0;
map = (ServerMap *)&(m_server->m_env->getMap());
emerge = m_server->m_emerge;
mapgen = emerge->mapgen[id];
enable_mapgen_debug_info = emerge->mapgen_debug_info;
+ porting::setThreadName("EmergeThread");
+
while (!StopRequested())
try {
if (!popBlockEmerge(&p, &flags)) {