#include "irrlichttypes_bloated.h"
#include <string>
#include <sstream>
-#include <list>
+#include <vector>
#include <map>
#include "debug.h"
{
dstream<<"ERROR: StaticObjectList::insert(): "
<<"id already exists"<<std::endl;
- assert(0);
- return;
+ FATAL_ERROR("StaticObjectList::insert()");
}
m_active[id] = obj;
}
void remove(u16 id)
{
- assert(id != 0);
+ assert(id != 0); // Pre-condition
if(m_active.find(id) == m_active.end())
{
- dstream<<"WARNING: StaticObjectList::remove(): id="<<id
+ warningstream<<"StaticObjectList::remove(): id="<<id
<<" not found"<<std::endl;
return;
}
from m_stored and inserted to m_active.
The caller directly manipulates these containers.
*/
- std::list<StaticObject> m_stored;
+ std::vector<StaticObject> m_stored;
std::map<u16, StaticObject> m_active;
private: