luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-13 16:45:20 +02:00
Code Activity

Fix issue #2441: crash on respawn, since a conversion std::list to std::vector on Environment.cpp

Browse Source 
* Also change some std::list to std::vector for ClientMap::renderMap
* Remove disabled code in ClientMap::renderMap, disabled since a long time
This commit is contained in:
Loic Blot
2015-03-05 15:34:39 +01:00
parent 0d1eedcccc
commit 9749d9fee6
7 changed files with 35 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/environment.cpp
View File

@@ -2383,13 +2383,16 @@ void ClientEnvironment::step(float dtime)
g_profiler->avg("CEnv: num of simple objects", m_simple_objects.size());
for(std::vector<ClientSimpleObject*>::iterator
i = m_simple_objects.begin(); i != m_simple_objects.end();) {
ClientSimpleObject *simple = *i;
std::vector<ClientSimpleObject*>::iterator cur = i;
++i;
ClientSimpleObject *simple = *cur;
simple->step(dtime);
if(simple->m_to_be_removed){
if(simple->m_to_be_removed) {
delete simple;
m_simple_objects.erase(cur);
i = m_simple_objects.erase(cur);
}
else {
++i;
}
}
}