Clean up EmergeManager, do initial work on Mapgen configuration

[dragonfireclient.git] / src / event_manager.h

diff --git a/src/event_manager.h b/src/event_manager.h
index b33d5a29594ef89e9064425f5aa397a0236293fe..9bc8e35eba745092da3cb22aefa28b9fa71e555a 100644 (file)
--- a/src/event_manager.h
+++ b/src/event_manager.h
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -77,26 +77,26 @@ class EventManager: public MtEventManager
                        std::map<std::string, Dest>::iterator i = m_dest.find(type);
                        if(i != m_dest.end()){
                                std::list<FuncSpec> &funcs = i->second.funcs;
-                               std::list<FuncSpec>::iterator i = funcs.begin();
-                               while(i != funcs.end()){
-                                       bool remove = (i->f == f && (!data || i->d == data));
+                               std::list<FuncSpec>::iterator j = funcs.begin();
+                               while(j != funcs.end()){
+                                       bool remove = (j->f == f && (!data || j->d == data));
                                        if(remove)
-                                               funcs.erase(i++);
+                                               funcs.erase(j++);
                                        else
-                                               i++;
+                                               j++;
                                }
                        }
                } else{
                        for(std::map<std::string, Dest>::iterator
                                        i = m_dest.begin(); i != m_dest.end(); i++){
                                std::list<FuncSpec> &funcs = i->second.funcs;
-                               std::list<FuncSpec>::iterator i = funcs.begin();
-                               while(i != funcs.end()){
-                                       bool remove = (i->f == f && (!data || i->d == data));
+                               std::list<FuncSpec>::iterator j = funcs.begin();
+                               while(j != funcs.end()){
+                                       bool remove = (j->f == f && (!data || j->d == data));
                                        if(remove)
-                                               funcs.erase(i++);
+                                               funcs.erase(j++);
                                        else
-                                               i++;
+                                               j++;
                                }
                        }
                }