summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-07-13 23:50:42 +0300
committerAndrei Karas <akaras@inbox.ru>2017-07-13 23:50:42 +0300
commit16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (patch)
tree1db34fd6c50a1421ac186a3652f1e43494881286 /src/resources
parentf5c004a94061cab1685fa063b039dc2eec29cbbe (diff)
downloadplus-16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1.tar.gz
plus-16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1.tar.bz2
plus-16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1.tar.xz
plus-16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1.zip
Add vector.h for use different vectors.
Also replace <vector> include into "utils/vector.h"
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/animation/animation.h5
-rw-r--r--src/resources/atlas/atlasresource.h4
-rw-r--r--src/resources/db/chardb.h4
-rw-r--r--src/resources/db/itemoptiondb.h3
-rw-r--r--src/resources/db/networkdb.h3
-rw-r--r--src/resources/db/questdb.h3
-rw-r--r--src/resources/db/statdb.h4
-rw-r--r--src/resources/db/weaponsdb.h2
-rw-r--r--src/resources/dye/dyepalette.h3
-rw-r--r--src/resources/imageset.h2
-rw-r--r--src/resources/map/map.h4
-rw-r--r--src/resources/map/maplayer.h4
-rw-r--r--src/resources/map/mapobjectlist.h2
-rw-r--r--src/resources/map/tileanimation.h3
-rw-r--r--src/resources/questitem.h3
-rw-r--r--src/resources/skill/skillinfo.h3
-rw-r--r--src/resources/soundinfo.h3
17 files changed, 32 insertions, 23 deletions
diff --git a/src/resources/animation/animation.h b/src/resources/animation/animation.h
index 1a493c62e..4a672aab2 100644
--- a/src/resources/animation/animation.h
+++ b/src/resources/animation/animation.h
@@ -23,10 +23,11 @@
#ifndef RESOURCES_ANIMATION_ANIMATION_H
#define RESOURCES_ANIMATION_ANIMATION_H
-#include "resources/frame.h"
#include "resources/memorycounter.h"
-#include <vector>
+#include "utils/vector.h"
+
+#include "resources/frame.h"
#include "localconsts.h"
diff --git a/src/resources/atlas/atlasresource.h b/src/resources/atlas/atlasresource.h
index 6f2178b6d..ba0d441ea 100644
--- a/src/resources/atlas/atlasresource.h
+++ b/src/resources/atlas/atlasresource.h
@@ -23,9 +23,9 @@
#ifdef USE_OPENGL
-#include "resources/resource.h"
+#include "utils/vector.h"
-#include <vector>
+#include "resources/resource.h"
struct TextureAtlas;
diff --git a/src/resources/db/chardb.h b/src/resources/db/chardb.h
index 9715497f1..083e7c12d 100644
--- a/src/resources/db/chardb.h
+++ b/src/resources/db/chardb.h
@@ -24,9 +24,9 @@
#include "utils/xml.h"
-#include "resources/beingslot.h"
+#include "utils/vector.h"
-#include <vector>
+#include "resources/beingslot.h"
/**
* Char information database.
diff --git a/src/resources/db/itemoptiondb.h b/src/resources/db/itemoptiondb.h
index 9e088c76f..a4fb82638 100644
--- a/src/resources/db/itemoptiondb.h
+++ b/src/resources/db/itemoptiondb.h
@@ -23,9 +23,10 @@
#include "enums/simpletypes/skiperror.h"
+#include "utils/vector.h"
+
#include <map>
#include <string>
-#include <vector>
#include "localconsts.h"
diff --git a/src/resources/db/networkdb.h b/src/resources/db/networkdb.h
index 0018daaa5..697adbc44 100644
--- a/src/resources/db/networkdb.h
+++ b/src/resources/db/networkdb.h
@@ -23,8 +23,9 @@
#include "enums/simpletypes/skiperror.h"
+#include "utils/vector.h"
+
#include <map>
-#include <vector>
#include <string>
typedef std::map<int32_t, int32_t> NetworkInPacketInfos;
diff --git a/src/resources/db/questdb.h b/src/resources/db/questdb.h
index 44a00631c..1bec2cc4e 100644
--- a/src/resources/db/questdb.h
+++ b/src/resources/db/questdb.h
@@ -23,10 +23,11 @@
#include "enums/simpletypes/skiperror.h"
+#include "utils/vector.h"
+
#include "resources/questvar.h"
#include <string>
-#include <vector>
#include "localconsts.h"
diff --git a/src/resources/db/statdb.h b/src/resources/db/statdb.h
index 1eaa6ed01..898f0af63 100644
--- a/src/resources/db/statdb.h
+++ b/src/resources/db/statdb.h
@@ -23,9 +23,9 @@
#include "enums/simpletypes/skiperror.h"
-#include "resources/basicstat.h"
+#include "utils/vector.h"
-#include <vector>
+#include "resources/basicstat.h"
#include "localconsts.h"
diff --git a/src/resources/db/weaponsdb.h b/src/resources/db/weaponsdb.h
index 9c7083c33..e30b4f544 100644
--- a/src/resources/db/weaponsdb.h
+++ b/src/resources/db/weaponsdb.h
@@ -21,7 +21,7 @@
#ifndef RESOURCES_DB_WEAPONSDB_H
#define RESOURCES_DB_WEAPONSDB_H
-#include <vector>
+#include "utils/vector.h"
#include "localconsts.h"
diff --git a/src/resources/dye/dyepalette.h b/src/resources/dye/dyepalette.h
index eee7f2327..95a26ca52 100644
--- a/src/resources/dye/dyepalette.h
+++ b/src/resources/dye/dyepalette.h
@@ -25,10 +25,11 @@
#include "resources/dye/dyecolor.h"
+#include "utils/vector.h"
+
#include "resources/dye/dyepaletteptr.h"
#include <string>
-#include <vector>
#include "localconsts.h"
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index 8d5cf6249..9aaad6e4b 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.h
@@ -25,7 +25,7 @@
#include "resources/resource.h"
-#include <vector>
+#include "utils/vector.h"
#include "localconsts.h"
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index c952b7ffa..8a2051a60 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -35,12 +35,12 @@
#include "listeners/configlistener.h"
+#include "utils/vector.h"
+
#include "resources/memorycounter.h"
#include "resources/map/properties.h"
-#include <vector>
-
class AmbientLayer;
class MapHeights;
class MapItem;
diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h
index a1c43d205..f5cf36fa9 100644
--- a/src/resources/map/maplayer.h
+++ b/src/resources/map/maplayer.h
@@ -31,9 +31,9 @@
#include "enums/resources/map/maptype.h"
-#include "resources/map/tileinfo.h"
+#include "utils/vector.h"
-#include <vector>
+#include "resources/map/tileinfo.h"
class Image;
class MapRowVertexes;
diff --git a/src/resources/map/mapobjectlist.h b/src/resources/map/mapobjectlist.h
index b205bfd86..139ee08ea 100644
--- a/src/resources/map/mapobjectlist.h
+++ b/src/resources/map/mapobjectlist.h
@@ -25,7 +25,7 @@
#include "resources/map/mapobject.h"
-#include <vector>
+#include "utils/vector.h"
#include "localconsts.h"
diff --git a/src/resources/map/tileanimation.h b/src/resources/map/tileanimation.h
index 953345c1a..bf4e9f232 100644
--- a/src/resources/map/tileanimation.h
+++ b/src/resources/map/tileanimation.h
@@ -23,8 +23,9 @@
#ifndef RESOURCES_MAP_TILEANIMATION_H
#define RESOURCES_MAP_TILEANIMATION_H
+#include "utils/vector.h"
+
#include <map>
-#include <vector>
#include "localconsts.h"
diff --git a/src/resources/questitem.h b/src/resources/questitem.h
index 24cb8be80..27a3881d6 100644
--- a/src/resources/questitem.h
+++ b/src/resources/questitem.h
@@ -23,8 +23,9 @@
#include "resources/questitemtext.h"
+#include "utils/vector.h"
+
#include <set>
-#include <vector>
#include "localconsts.h"
diff --git a/src/resources/skill/skillinfo.h b/src/resources/skill/skillinfo.h
index ac632e193..4b4f58fb9 100644
--- a/src/resources/skill/skillinfo.h
+++ b/src/resources/skill/skillinfo.h
@@ -30,8 +30,9 @@
#include "enums/resources/skill/skillowner.h"
#include "enums/resources/skill/skilltype.h"
+#include "utils/vector.h"
+
#include <string>
-#include <vector>
#include <map>
#include "localconsts.h"
diff --git a/src/resources/soundinfo.h b/src/resources/soundinfo.h
index 6a18b648e..51fed06bf 100644
--- a/src/resources/soundinfo.h
+++ b/src/resources/soundinfo.h
@@ -23,9 +23,10 @@
#include "enums/resources/item/itemsoundevent.h"
+#include "utils/vector.h"
+
#include <map>
#include <string>
-#include <vector>
#include "localconsts.h"