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

Fix some lingering code style issues

Browse source
This commit is contained in:
kwolekr 2014-12-29 22:04:47 -05:00
parent 0974337804
commit f12118c38b
8 changed files with 138 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/emerge.cpp
View file

@ -140,7 +140,7 @@ EmergeManager::EmergeManager(IGameDef *gamedef)
EmergeManager::~EmergeManager()
{
for (unsigned int i = 0; i != emergethread.size(); i++) {
for (u32 i = 0; i != emergethread.size(); i++) {
if (threads_active) {
emergethread[i]->Stop();
emergethread[i]->qevent.signal();
@ -193,7 +193,7 @@ void EmergeManager::initMapgens()
}
// Create the mapgens
for (size_t i = 0; i != emergethread.size(); i++) {
for (u32 i = 0; i != emergethread.size(); i++) {
Mapgen *mg = createMapgen(params.mg_name, i, &params);
assert(mg);
mapgen.push_back(mg);
@ -203,7 +203,7 @@ void EmergeManager::initMapgens()
Mapgen *EmergeManager::getCurrentMapgen()
{
for (unsigned int i = 0; i != emergethread.size(); i++) {
for (u32 i = 0; i != emergethread.size(); i++) {
if (emergethread[i]->IsSameThread())
return emergethread[i]->mapgen;
}
@ -217,7 +217,7 @@ void EmergeManager::startThreads()
if (threads_active)
return;
for (unsigned int i = 0; i != emergethread.size(); i++)
for (u32 i = 0; i != emergethread.size(); i++)
emergethread[i]->Start();
threads_active = true;
@ -230,13 +230,13 @@ void EmergeManager::stopThreads()
return;
// Request thread stop in parallel
for (unsigned int i = 0; i != emergethread.size(); i++) {
for (u32 i = 0; i != emergethread.size(); i++) {
emergethread[i]->Stop();
emergethread[i]->qevent.signal();
}
// Then do the waiting for each
for (unsigned int i = 0; i != emergethread.size(); i++)
for (u32 i = 0; i != emergethread.size(); i++)
emergethread[i]->Wait();
threads_active = false;
@ -282,7 +282,7 @@ bool EmergeManager::enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate
// insert into the EmergeThread queue with the least items
int lowestitems = emergethread[0]->blockqueue.size();
for (unsigned int i = 1; i != emergethread.size(); i++) {
for (u32 i = 1; i != emergethread.size(); i++) {
int nitems = emergethread[i]->blockqueue.size();
if (nitems < lowestitems) {
idx = i;