diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2015-03-04 17:18:57 +0100 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2015-03-04 17:22:37 +0100 |
| commit | cd684497c28a93e1bca4fbe889eef2d6d5c59289 (patch) | |
| tree | 20fd3eb2e9e3605803204140bfe2352018049c0d /src/staticobject.cpp | |
| parent | 06f328207fa0a3e606992d3569b061b335eb0f48 (diff) | |
| download | minetest-cd684497c28a93e1bca4fbe889eef2d6d5c59289.tar.gz minetest-cd684497c28a93e1bca4fbe889eef2d6d5c59289.tar.bz2 minetest-cd684497c28a93e1bca4fbe889eef2d6d5c59289.zip | |
Use std::vector instead of std::list in StaticObjectList and MutexedMap::getValues()
Diffstat (limited to 'src/staticobject.cpp')
| -rw-r--r-- | src/staticobject.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/staticobject.cpp b/src/staticobject.cpp index 16d98605b..2e7d45a47 100644 --- a/src/staticobject.cpp +++ b/src/staticobject.cpp @@ -47,10 +47,9 @@ void StaticObjectList::serialize(std::ostream &os) // count u16 count = m_stored.size() + m_active.size(); writeU16(os, count); - for(std::list<StaticObject>::iterator + for(std::vector<StaticObject>::iterator i = m_stored.begin(); - i != m_stored.end(); ++i) - { + i != m_stored.end(); ++i) { StaticObject &s_obj = *i; s_obj.serialize(os); } @@ -68,8 +67,7 @@ void StaticObjectList::deSerialize(std::istream &is) u8 version = readU8(is); // count u16 count = readU16(is); - for(u16 i=0; i<count; i++) - { + for(u16 i = 0; i < count; i++) { StaticObject s_obj; s_obj.deSerialize(is, version); m_stored.push_back(s_obj); |