From 26153bab7dbe57a0200949c9a121058150e67f6c Mon Sep 17 00:00:00 2001 From: kwolekr Date: Fri, 20 Mar 2015 18:40:18 -0400 Subject: Revert "Fix issue #2441: crash on respawn, since a conversion std::list to std::vector on Environment.cpp" This reverts parts of commit 9749d9fee6db99da1ab861dc04ec63ef973db3e0, which breaks node resolver list clearing --- src/mapgen.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/mapgen.cpp') diff --git a/src/mapgen.cpp b/src/mapgen.cpp index 137418471..fd4fe5bb0 100644 --- a/src/mapgen.cpp +++ b/src/mapgen.cpp @@ -412,8 +412,9 @@ void GenerateNotifier::getEvents( std::map > &event_map, bool peek_events) { - for (std::vector::iterator it = m_notify_events.begin(); - it != m_notify_events.end(); ++it) { + std::list::iterator it; + + for (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) : -- cgit v1.2.3