oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Remove blank default values for emergequeue_limit_* settings

Browse source 
Add checks for invalid user input for important settings
Rename Settings::tryGet* to Settings::get*NoEx for consistency
This commit is contained in:
kwolekr 2014-02-05 00:17:53 -05:00
parent c6c5edd73a
commit 7f743178db
6 changed files with 32 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/emerge.cpp
View file

@ -102,17 +102,25 @@ EmergeManager::EmergeManager(IGameDef *gamedef) {
// 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));
@ -352,13 +360,13 @@ void EmergeManager::loadParamsFromSettings(Settings *settings) {
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);