diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2014-09-11 18:22:05 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2014-09-21 14:39:35 -0400 |
| commit | 6bc4cad0eddd7a7cf593ca1471599e2d75727379 (patch) | |
| tree | d05d5f039648d18f49fc0cf56132b2e9a5c88e09 /src/emerge.cpp | |
| parent | 2ae5d3f3abc7ac5ee96c4dfc7eeead045fdc775e (diff) | |
| download | minetest-6bc4cad0eddd7a7cf593ca1471599e2d75727379.tar.gz minetest-6bc4cad0eddd7a7cf593ca1471599e2d75727379.tar.bz2 minetest-6bc4cad0eddd7a7cf593ca1471599e2d75727379.zip | |
Split settings into seperate source and header files
This also cleans up settings a bit
Diffstat (limited to 'src/emerge.cpp')
| -rw-r--r-- | src/emerge.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emerge.cpp b/src/emerge.cpp index a2b265486..b6e2080a6 100644 --- a/src/emerge.cpp +++ b/src/emerge.cpp @@ -97,7 +97,7 @@ EmergeManager::EmergeManager(IGameDef *gamedef) { // if unspecified, leave a proc for the main thread and one for // some other misc thread - int nthreads = 0; + s16 nthreads = 0; if (!g_settings->getS16NoEx("num_emerge_threads", nthreads)) nthreads = porting::getNumberOfProcessors() - 2; if (nthreads < 1) @@ -117,8 +117,8 @@ EmergeManager::EmergeManager(IGameDef *gamedef) { if (qlimit_generate < 1) qlimit_generate = 1; - for (int i = 0; i != nthreads; i++) - emergethread.push_back(new EmergeThread((Server *)gamedef, i)); + for (s16 i = 0; i < nthreads; i++) + emergethread.push_back(new EmergeThread((Server *) gamedef, i)); infostream << "EmergeManager: using " << nthreads << " threads" << std::endl; } |