diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-06-13 18:40:11 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-06-13 18:40:11 +0300 |
| commit | 55b1de961489f99723288e162f9d3a062d593368 (patch) | |
| tree | 8e0420837f222828070fd7df010ede11c2ec90ed /src/resources/atlas | |
| parent | bcbcdde49b5ff85c5ff4b8356dad475698d28f4e (diff) | |
| download | manaverse-55b1de961489f99723288e162f9d3a062d593368.tar.gz manaverse-55b1de961489f99723288e162f9d3a062d593368.tar.bz2 manaverse-55b1de961489f99723288e162f9d3a062d593368.tar.xz manaverse-55b1de961489f99723288e162f9d3a062d593368.zip | |
Fix includes and update deheader ci script.
Diffstat (limited to 'src/resources/atlas')
| -rw-r--r-- | src/resources/atlas/atlasitem.h | 2 | ||||
| -rw-r--r-- | src/resources/atlas/atlasmanager.cpp | 4 | ||||
| -rw-r--r-- | src/resources/atlas/atlasmanager.h | 2 | ||||
| -rw-r--r-- | src/resources/atlas/atlasresource.cpp | 1 | ||||
| -rw-r--r-- | src/resources/atlas/textureatlas.h | 5 |
5 files changed, 2 insertions, 12 deletions
diff --git a/src/resources/atlas/atlasitem.h b/src/resources/atlas/atlasitem.h index ae0c0d206..d6037f056 100644 --- a/src/resources/atlas/atlasitem.h +++ b/src/resources/atlas/atlasitem.h @@ -23,8 +23,6 @@ #ifdef USE_OPENGL -#include "resources/memorycounter.h" - #include "resources/image/image.h" #include <string> diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp index 353818d68..bc1bf8224 100644 --- a/src/resources/atlas/atlasmanager.cpp +++ b/src/resources/atlas/atlasmanager.cpp @@ -33,10 +33,8 @@ #include "utils/physfsrwops.h" #include "utils/sdlcheckutils.h" -#include "resources/imagehelper.h" #include "resources/openglimagehelper.h" -#include "resources/atlas/atlasitem.h" #include "resources/atlas/atlasresource.h" #include "resources/atlas/textureatlas.h" @@ -44,6 +42,8 @@ #include "resources/resourcemanager/resourcemanager.h" +#include <SDL_endian.h> + #include "debug.h" #ifndef SDL_BYTEORDER diff --git a/src/resources/atlas/atlasmanager.h b/src/resources/atlas/atlasmanager.h index 76fca7223..fdee09ecf 100644 --- a/src/resources/atlas/atlasmanager.h +++ b/src/resources/atlas/atlasmanager.h @@ -27,8 +27,6 @@ #include "utils/stringvector.h" -#include <SDL.h> - class AtlasResource; struct AtlasItem; diff --git a/src/resources/atlas/atlasresource.cpp b/src/resources/atlas/atlasresource.cpp index 5f2e24160..915d33f33 100644 --- a/src/resources/atlas/atlasresource.cpp +++ b/src/resources/atlas/atlasresource.cpp @@ -22,7 +22,6 @@ #include "resources/atlas/atlasresource.h" -#include "resources/atlas/atlasitem.h" #include "resources/atlas/atlasmanager.h" #include "resources/atlas/textureatlas.h" diff --git a/src/resources/atlas/textureatlas.h b/src/resources/atlas/textureatlas.h index 78819fa00..98665d5a2 100644 --- a/src/resources/atlas/textureatlas.h +++ b/src/resources/atlas/textureatlas.h @@ -25,13 +25,8 @@ #include "utils/stringvector.h" -#include "resources/memorycounter.h" - #include "resources/atlas/atlasitem.h" -#include <vector> -#include <SDL.h> - #include "localconsts.h" class AtlasResource; |