summaryrefslogtreecommitdiff
path: root/src/resources
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/resources
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/resources')
-rw-r--r--src/resources/emotedb.h3
-rw-r--r--src/resources/spritedef.h7
2 files changed, 6 insertions, 4 deletions
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index 53a39685e..94d97a872 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -24,6 +24,7 @@
#include <list>
#include <map>
#include <string>
+#include <vector>
class AnimatedSprite;
@@ -36,7 +37,7 @@ struct EmoteSprite
struct EmoteInfo
{
std::list<EmoteSprite*> sprites;
- std::list<std::string> particles;
+ std::vector<std::string> particles;
};
typedef std::map<int, EmoteInfo*> EmoteInfos;
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 424d88869..475ab2e25 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -30,6 +30,7 @@
#include <list>
#include <map>
#include <string>
+#include <vector>
class Action;
class ImageSet;
@@ -56,11 +57,11 @@ struct SpriteDisplay
{
std::string image;
std::string floor;
- std::list<SpriteReference*> sprites;
- std::list<std::string> particles;
+ std::vector<SpriteReference*> sprites;
+ std::vector<std::string> particles;
};
-typedef std::list<SpriteReference*>::const_iterator SpriteRefs;
+typedef std::vector<SpriteReference*>::const_iterator SpriteRefs;
/*
* Remember those are the main action.