projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 6fccbdd4fa9624175fd86e078422a17c9cf8fbc7..575c15b18d9de747c9fbaf717cb30ce169d90a22 100644
(file)
--- a/
src/staticobject.h
+++ b/
src/staticobject.h
@@
-1,6
+1,6
@@
/*
/*
-Minetest
-c55
-Copyright (C) 2010-201
1
celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-201
3
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
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 "irrlichttypes_bloated.h"
#include <string>
#include <sstream>
+#include <list>
+#include <map>
#include "debug.h"
struct StaticObject
#include "debug.h"
struct StaticObject
@@
-52,7
+54,7
@@
class StaticObjectList
public:
/*
Inserts an object to the container.
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)
{
*/
void insert(u16 id, StaticObject obj)
{
@@
-62,27
+64,27
@@
public:
}
else
{
}
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;
}
{
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);
}
}
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;
}
{
dstream<<"WARNING: StaticObjectList::remove(): id="<<id
<<" not found"<<std::endl;
return;
}
- m_active.
remov
e(id);
+ m_active.
eras
e(id);
}
void serialize(std::ostream &os);
}
void serialize(std::ostream &os);
@@
-93,8
+95,8
@@
public:
from m_stored and inserted to m_active.
The caller directly manipulates these containers.
*/
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:
};
private:
};