From 16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 13 Jul 2017 23:50:42 +0300 Subject: Add vector.h for use different vectors. Also replace include into "utils/vector.h" --- src/resources/animation/animation.h | 5 +++-- src/resources/atlas/atlasresource.h | 4 ++-- src/resources/db/chardb.h | 4 ++-- src/resources/db/itemoptiondb.h | 3 ++- src/resources/db/networkdb.h | 3 ++- src/resources/db/questdb.h | 3 ++- src/resources/db/statdb.h | 4 ++-- src/resources/db/weaponsdb.h | 2 +- src/resources/dye/dyepalette.h | 3 ++- src/resources/imageset.h | 2 +- src/resources/map/map.h | 4 ++-- src/resources/map/maplayer.h | 4 ++-- src/resources/map/mapobjectlist.h | 2 +- src/resources/map/tileanimation.h | 3 ++- src/resources/questitem.h | 3 ++- src/resources/skill/skillinfo.h | 3 ++- src/resources/soundinfo.h | 3 ++- 17 files changed, 32 insertions(+), 23 deletions(-) (limited to 'src/resources') 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 +#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 +#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 +#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 #include -#include #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 -#include #include typedef std::map 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 -#include #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 +#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 +#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 -#include #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 +#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 - 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 +#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 +#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 -#include #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 -#include #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 -#include #include #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 #include -#include #include "localconsts.h" -- cgit v1.2.3-60-g2f50