diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2015-03-05 15:34:39 +0100 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2015-03-05 15:36:20 +0100 |
| commit | 9749d9fee6db99da1ab861dc04ec63ef973db3e0 (patch) | |
| tree | ddf9c165e187a5bccdf0226f01b7bb35a6518ee8 /src/mapgen.cpp | |
| parent | 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 (diff) | |
| download | minetest-9749d9fee6db99da1ab861dc04ec63ef973db3e0.tar.gz minetest-9749d9fee6db99da1ab861dc04ec63ef973db3e0.tar.bz2 minetest-9749d9fee6db99da1ab861dc04ec63ef973db3e0.zip | |
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
Diffstat (limited to 'src/mapgen.cpp')
| -rw-r--r-- | src/mapgen.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mapgen.cpp b/src/mapgen.cpp index ba1b16d6a..071c60138 100644 --- a/src/mapgen.cpp +++ b/src/mapgen.cpp @@ -417,9 +417,8 @@ void GenerateNotifier::getEvents( std::map<std::string, std::vector<v3s16> > &event_map, bool peek_events) { - std::list<GenNotifyEvent>::iterator it; - - for (it = m_notify_events.begin(); it != m_notify_events.end(); ++it) { + for (std::vector<GenNotifyEvent>::iterator it = m_notify_events.begin(); + it != m_notify_events.end(); ++it) { GenNotifyEvent &gn = *it; std::string name = (gn.type == GENNOTIFY_DECORATION) ? "decoration#"+ itos(gn.id) : |