summaryrefslogtreecommitdiff
path: root/src/resources/map/map.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-07-14 01:31:22 +0300
committerAndrei Karas <akaras@inbox.ru>2017-07-14 01:31:22 +0300
commit311c175f3184103950c72bc5c775174597430b83 (patch)
treead022dc44a1c4177b3d53bf0d7eaa5a1736c8cf1 /src/resources/map/map.cpp
parent16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff)
downloadmv-311c175f3184103950c72bc5c775174597430b83.tar.gz
mv-311c175f3184103950c72bc5c775174597430b83.tar.bz2
mv-311c175f3184103950c72bc5c775174597430b83.tar.xz
mv-311c175f3184103950c72bc5c775174597430b83.zip
Replace std::vector into macro STD_VECTOR.
In most case it equal to std::vector except debug modes. Now it can be also mse::mstd::vector, but sadly this class not support all required features.
Diffstat (limited to 'src/resources/map/map.cpp')
-rw-r--r--src/resources/map/map.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index 8deea4b23..675c9ca58 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -1105,7 +1105,7 @@ void Map::initializeParticleEffects() const restrict2
if (config.getBoolValue("particleeffects"))
{
- for (std::vector<ParticleEffectData>::const_iterator
+ for (STD_VECTOR<ParticleEffectData>::const_iterator
i = mParticleEffects.begin();
i != mParticleEffects.end();
++i)
@@ -1315,7 +1315,7 @@ void Map::updatePortalTile(const std::string &restrict name,
MapItem *Map::findPortalXY(const int x, const int y) const restrict2
{
- FOR_EACH (std::vector<MapItem*>::const_iterator, it, mMapPortals)
+ FOR_EACH (STD_VECTOR<MapItem*>::const_iterator, it, mMapPortals)
{
if (*it == nullptr)
continue;
@@ -1378,8 +1378,8 @@ std::string Map::getObjectData(const unsigned x, const unsigned y,
if (list == nullptr)
return "";
- std::vector<MapObject>::const_iterator it = list->objects.begin();
- const std::vector<MapObject>::const_iterator it_end = list->objects.end();
+ STD_VECTOR<MapObject>::const_iterator it = list->objects.begin();
+ const STD_VECTOR<MapObject>::const_iterator it_end = list->objects.end();
while (it != it_end)
{
if ((*it).type == type)