Mapgens: Rename m_emerge to prevent name collisions

[oweals/minetest.git] / src / staticobject.h

diff --git a/src/staticobject.h b/src/staticobject.h
index ca358236c5c18661dea17a7520685851f465451e..575c15b18d9de747c9fbaf717cb30ce169d90a22 100644 (file)
--- a/src/staticobject.h
+++ b/src/staticobject.h
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2013 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 Lesser General Public License as published by
@@ -23,6 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_bloated.h"
 #include <string>
 #include <sstream>
+#include <list>
+#include <map>
 #include "debug.h"
 
 struct StaticObject
@@ -52,7 +54,7 @@ class StaticObjectList
 public:
        /*
                Inserts an object to the container.
-               Id must be unique or 0.
+               Id must be unique (active) or 0 (stored).
        */
        void insert(u16 id, StaticObject obj)
        {
@@ -62,27 +64,27 @@ public:
                }
                else
                {
-                       if(m_active.find(id) != NULL)
+                       if(m_active.find(id) != m_active.end())
                        {
                                dstream<<"ERROR: StaticObjectList::insert(): "
                                                <<"id already exists"<<std::endl;
                                assert(0);
                                return;
                        }
-                       m_active.insert(id, obj);
+                       m_active[id] = obj;
                }
        }
 
        void remove(u16 id)
        {
                assert(id != 0);
-               if(m_active.find(id) == NULL)
+               if(m_active.find(id) == m_active.end())
                {
                        dstream<<"WARNING: StaticObjectList::remove(): id="<<id
                                        <<" not found"<<std::endl;
                        return;
                }
-               m_active.remove(id);
+               m_active.erase(id);
        }
 
        void serialize(std::ostream &os);
@@ -93,8 +95,8 @@ public:
                from m_stored and inserted to m_active.
                The caller directly manipulates these containers.
        */
-       core::list<StaticObject> m_stored;
-       core::map<u16, StaticObject> m_active;
+       std::list<StaticObject> m_stored;
+       std::map<u16, StaticObject> m_active;
 
 private:
 };