Futuray-pgm
/
voxelands
forked from oerkki/voxelands
1
1
Fork 0
Code Pull Requests Activity

ignore what the comment says, do it anyway

This commit is contained in:
darkrose 2015-03-21 01:05:57 +10:00
parent 8a600b4005
commit 9eec03e777
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/environment.cpp
View File

@ -3610,14 +3610,6 @@ void ServerEnvironment::activateObjects(MapBlock *block)
if(block->m_static_objects.m_stored.size() == 0) if(block->m_static_objects.m_stored.size() == 0)
return; return;
// objects that were pending deactivation, shouldn't be anymore
for (core::map<u16,StaticObject>::Iterator i = block->m_static_objects.m_active.getIterator(); i.atEnd() == false; i++) {
u16 id = i.getNode()->getKey();
ServerActiveObject *object = getActiveObject(id);
if (object)
object->m_pending_deactivation = false;
}
verbosestream<<"ServerEnvironment::activateObjects(): " verbosestream<<"ServerEnvironment::activateObjects(): "
<<"activating objects of block "<<PP(block->getPos()) <<"activating objects of block "<<PP(block->getPos())
<<" ("<<block->m_static_objects.m_stored.size() <<" ("<<block->m_static_objects.m_stored.size()
@ -3667,6 +3659,14 @@ void ServerEnvironment::activateObjects(MapBlock *block)
block->m_static_objects.m_stored.push_back(s_obj); block->m_static_objects.m_stored.push_back(s_obj);
} }
// objects that were pending deactivation, shouldn't be anymore
for (core::map<u16,StaticObject>::Iterator i = block->m_static_objects.m_active.getIterator(); i.atEnd() == false; i++) {
u16 id = i.getNode()->getKey();
ServerActiveObject *object = getActiveObject(id);
if (object)
object->m_pending_deactivation = false;
}
/* /*
Note: Block hasn't really been modified here. Note: Block hasn't really been modified here.
The objects have just been activated and moved from the stored The objects have just been activated and moved from the stored
@ -3675,6 +3675,7 @@ void ServerEnvironment::activateObjects(MapBlock *block)
Thus, do not call block->raiseModified(MOD_STATE_WRITE_NEEDED). Thus, do not call block->raiseModified(MOD_STATE_WRITE_NEEDED).
Otherwise there would be a huge amount of unnecessary I/O. Otherwise there would be a huge amount of unnecessary I/O.
*/ */
block->raiseModified(MOD_STATE_WRITE_NEEDED);
} }
/* /*