mirror of
https://github.com/luanti-org/luanti.git
synced 2025-06-27 16:36:03 +00:00
Fix issue #2441: crash on respawn, since a conversion std::list to std::vector on Environment.cpp
* 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:
parent
0d1eedcccc
commit
9749d9fee6
7 changed files with 35 additions and 84 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue