summaryrefslogtreecommitdiff
path: root/src/map.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-06-30 23:14:59 +0300
committerAndrei Karas <akaras@inbox.ru>2011-07-01 02:08:53 +0300
commit32014de9008efe051a1a8b05e5e976a4629b34d2 (patch)
tree694b93739685b8b8462c7f602b8ae693be5e65bf /src/map.h
parent5c260f683e26529d7cf02c12c1fff70a7a7e5eb8 (diff)
downloadmanaplus-32014de9008efe051a1a8b05e5e976a4629b34d2.tar.gz
manaplus-32014de9008efe051a1a8b05e5e976a4629b34d2.tar.bz2
manaplus-32014de9008efe051a1a8b05e5e976a4629b34d2.tar.xz
manaplus-32014de9008efe051a1a8b05e5e976a4629b34d2.zip
Replace some lists to vectors.
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map.h b/src/map.h
index 1cf0da559..fb06c26a6 100644
--- a/src/map.h
+++ b/src/map.h
@@ -92,7 +92,7 @@ class MapObject
class MapObjectList
{
public:
- std::list<MapObject> objects;
+ std::vector<MapObject> objects;
};
/**
@@ -107,7 +107,7 @@ class TileAnimation
void addAffectedTile(MapLayer *layer, int index)
{ mAffected.push_back(std::make_pair(layer, index)); }
private:
- std::list<std::pair<MapLayer*, int> > mAffected;
+ std::vector<std::pair<MapLayer*, int> > mAffected;
SimpleAnimation *mAnimation;
Image *mLastImage;
};
@@ -427,7 +427,7 @@ class Map : public Properties, public ConfigListener
void updatePortalTile(const std::string &name, int type,
int x, int y, bool addNew = true);
- std::list<MapItem*> &getPortals()
+ std::vector<MapItem*> &getPortals()
{ return mMapPortals; }
/**
@@ -521,8 +521,8 @@ class Map : public Properties, public ConfigListener
unsigned mOnClosedList, mOnOpenList;
// Overlay data
- std::list<AmbientLayer*> mBackgrounds;
- std::list<AmbientLayer*> mForegrounds;
+ std::vector<AmbientLayer*> mBackgrounds;
+ std::vector<AmbientLayer*> mForegrounds;
float mLastScrollX;
float mLastScrollY;
// bool mSpritesUpdated;
@@ -538,7 +538,7 @@ class Map : public Properties, public ConfigListener
};
std::vector<ParticleEffectData> particleEffects;
- std::list<MapItem*> mMapPortals;
+ std::vector<MapItem*> mMapPortals;
std::map<int, TileAnimation*> mTileAnimations;