diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-05-29 14:55:40 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-05-29 14:55:40 +0300 |
commit | 4c6264db7ad4f0ae8a6c001903b47741abb94d8c (patch) | |
tree | a4e95239130dc4b86d036acd10c95f5fe3b96999 /src/resources | |
parent | f6e76f469a81ff2d9e3714d39d1a8f4012cda2b8 (diff) | |
download | manaverse-4c6264db7ad4f0ae8a6c001903b47741abb94d8c.tar.gz manaverse-4c6264db7ad4f0ae8a6c001903b47741abb94d8c.tar.bz2 manaverse-4c6264db7ad4f0ae8a6c001903b47741abb94d8c.tar.xz manaverse-4c6264db7ad4f0ae8a6c001903b47741abb94d8c.zip |
Fix code style.
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/atlas/atlasmanager.cpp | 1 | ||||
-rw-r--r-- | src/resources/loaders/shaderloader.cpp | 2 | ||||
-rw-r--r-- | src/resources/loaders/spritedefloader.cpp | 2 | ||||
-rw-r--r-- | src/resources/loaders/subimageloader.cpp | 1 | ||||
-rw-r--r-- | src/resources/loaders/subimageloader.h | 2 | ||||
-rw-r--r-- | src/resources/loaders/subimagesetloader.cpp | 3 | ||||
-rw-r--r-- | src/resources/map/objectslayer.cpp | 4 | ||||
-rw-r--r-- | src/resources/resourcemanager/resourcemanager.cpp | 16 | ||||
-rw-r--r-- | src/resources/resourcemanager/resourcemanager.h | 9 |
9 files changed, 6 insertions, 34 deletions
diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp index 7a375b243..46f161e6a 100644 --- a/src/resources/atlas/atlasmanager.cpp +++ b/src/resources/atlas/atlasmanager.cpp @@ -35,7 +35,6 @@ #include "resources/imagehelper.h" #include "resources/openglimagehelper.h" -#include "resources/sdlimagehelper.h" #include "resources/atlas/atlasitem.h" #include "resources/atlas/atlasresource.h" diff --git a/src/resources/loaders/shaderloader.cpp b/src/resources/loaders/shaderloader.cpp index 683e4206d..bd5c35dee 100644 --- a/src/resources/loaders/shaderloader.cpp +++ b/src/resources/loaders/shaderloader.cpp @@ -55,7 +55,7 @@ namespace return resource; } }; -} +} // namespace Resource *Loader::getShader(const unsigned int type, const std::string &name) diff --git a/src/resources/loaders/spritedefloader.cpp b/src/resources/loaders/spritedefloader.cpp index 3c68b7c87..d49955ac4 100644 --- a/src/resources/loaders/spritedefloader.cpp +++ b/src/resources/loaders/spritedefloader.cpp @@ -20,7 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "logger.h" #include "settings.h" #include "resources/loaders/spritedefloader.h" @@ -29,7 +28,6 @@ #include "resources/sprite/spritedef.h" -#include "utils/checkutils.h" #include "utils/stringutils.h" #include "debug.h" diff --git a/src/resources/loaders/subimageloader.cpp b/src/resources/loaders/subimageloader.cpp index 9d61a305d..1331da245 100644 --- a/src/resources/loaders/subimageloader.cpp +++ b/src/resources/loaders/subimageloader.cpp @@ -29,7 +29,6 @@ #include "resources/resourcemanager/resourcemanager.h" #include "utils/checkutils.h" -#include "utils/physfsrwops.h" #include "utils/stringutils.h" #include "debug.h" diff --git a/src/resources/loaders/subimageloader.h b/src/resources/loaders/subimageloader.h index 222c967e1..05586d6cc 100644 --- a/src/resources/loaders/subimageloader.h +++ b/src/resources/loaders/subimageloader.h @@ -34,6 +34,6 @@ namespace Loader const int y, const int width, const int height) A_WARN_UNUSED; -} // namespace SubImageLoader +} // namespace Loader #endif // RESOURCES_RESOURCEMANAGER_SUBIMAGELOADER_H diff --git a/src/resources/loaders/subimagesetloader.cpp b/src/resources/loaders/subimagesetloader.cpp index 39068bce3..a8db6771a 100644 --- a/src/resources/loaders/subimagesetloader.cpp +++ b/src/resources/loaders/subimagesetloader.cpp @@ -20,8 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "logger.h" - #include "resources/image.h" #include "resources/imageset.h" @@ -29,7 +27,6 @@ #include "resources/loaders/subimagesetloader.h" -#include "utils/checkutils.h" #include "utils/stringutils.h" #include "debug.h" diff --git a/src/resources/map/objectslayer.cpp b/src/resources/map/objectslayer.cpp index b121fbcf9..87fe11a94 100644 --- a/src/resources/map/objectslayer.cpp +++ b/src/resources/map/objectslayer.cpp @@ -79,6 +79,6 @@ MapObjectList *ObjectsLayer::getAt(const unsigned x, const unsigned y) const int ObjectsLayer::calcMemoryLocal() const { - return sizeof(ObjectsLayer) + - (sizeof(MapObjectList) + sizeof(MapObjectList*)) * mWidth * mHeight; + return CAST_S32(sizeof(ObjectsLayer) + + (sizeof(MapObjectList) + sizeof(MapObjectList*)) * mWidth * mHeight); } diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp index b2d4d483d..d61ec9342 100644 --- a/src/resources/resourcemanager/resourcemanager.cpp +++ b/src/resources/resourcemanager/resourcemanager.cpp @@ -24,31 +24,19 @@ #include "configuration.h" #include "logger.h" -#include "navigationmanager.h" - -#include "resources/map/walklayer.h" #ifdef USE_OPENGL -#include "resources/atlas/atlasmanager.h" -#include "resources/atlas/atlasresource.h" -#else // USE_OPENGL #include "resources/image.h" -#endif // USE_OPENGL -#include "resources/imagehelper.h" #include "resources/imageset.h" +#endif // USE_OPENGL #include "resources/memorymanager.h" -#include "resources/dye/dye.h" - -#include "resources/loaders/imageloader.h" - #include "resources/sprite/spritedef.h" #include "utils/checkutils.h" #include "utils/delete2.h" -#include "utils/physfscheckutils.h" #include "utils/physfsrwops.h" -#include "utils/sdlcheckutils.h" +#include "utils/physfstools.h" #ifdef USE_OPENGL #include "render/shaders/shader.h" diff --git a/src/resources/resourcemanager/resourcemanager.h b/src/resources/resourcemanager/resourcemanager.h index caad4bb6e..0a7629257 100644 --- a/src/resources/resourcemanager/resourcemanager.h +++ b/src/resources/resourcemanager/resourcemanager.h @@ -27,21 +27,12 @@ #include "enums/simpletypes/append.h" -#include "utils/stringvector.h" - #include <map> #include <set> #include "localconsts.h" -class Image; -class ImageSet; -class Map; -class SDLMusic; class Resource; -class SoundEffect; -class SpriteDef; -class WalkLayer; struct SDL_Surface; struct SDL_RWops; |