diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | src/Makefile.am | 12 | ||||
| -rw-r--r-- | src/resources/atlas/atlasitem.h (renamed from src/resources/atlasitem.h) | 6 | ||||
| -rw-r--r-- | src/resources/atlas/atlasmanager.cpp (renamed from src/resources/atlasmanager.cpp) | 9 | ||||
| -rw-r--r-- | src/resources/atlas/atlasmanager.h (renamed from src/resources/atlasmanager.h) | 6 | ||||
| -rw-r--r-- | src/resources/atlas/atlasresource.cpp (renamed from src/resources/atlasresource.cpp) | 9 | ||||
| -rw-r--r-- | src/resources/atlas/atlasresource.h (renamed from src/resources/atlasresource.h) | 6 | ||||
| -rw-r--r-- | src/resources/atlas/textureatlas.h (renamed from src/resources/textureatlas.h) | 6 | ||||
| -rw-r--r-- | src/resources/resourcemanager.cpp | 4 |
9 files changed, 37 insertions, 35 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dcc88442a..4a980ec19 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -593,11 +593,11 @@ SET(SRCS resources/ambientlayer.h resources/animation.cpp resources/animation.h - resources/atlasitem.h - resources/atlasmanager.cpp - resources/atlasmanager.h - resources/atlasresource.cpp - resources/atlasresource.h + resources/atlas/atlasitem.h + resources/atlas/atlasmanager.cpp + resources/atlas/atlasmanager.h + resources/atlas/atlasresource.cpp + resources/atlas/atlasresource.h resources/attack.h resources/db/avatardb.cpp resources/db/avatardb.h @@ -744,7 +744,7 @@ SET(SRCS resources/subimage.h resources/surfaceimagehelper.cpp resources/surfaceimagehelper.h - resources/textureatlas.h + resources/atlas/textureatlas.h resources/updatefile.h resources/wallpaper.cpp resources/wallpaper.h @@ -1371,7 +1371,7 @@ SET(DYE_CMD_SRCS resources/subimage.h resources/surfaceimagehelper.cpp resources/surfaceimagehelper.h - resources/textureatlas.h + resources/atlas/textureatlas.h resources/updatefile.h resources/sprite/spritedef.cpp resources/sprite/spritedef.h diff --git a/src/Makefile.am b/src/Makefile.am index f26e6332f..d11d4b5cb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -312,11 +312,11 @@ SRC += events/actionevent.h \ resources/action.h \ resources/ambientlayer.cpp \ resources/ambientlayer.h \ - resources/atlasitem.h \ - resources/atlasmanager.cpp \ - resources/atlasmanager.h \ - resources/atlasresource.cpp \ - resources/atlasresource.h \ + resources/atlas/atlasitem.h \ + resources/atlas/atlasmanager.cpp \ + resources/atlas/atlasmanager.h \ + resources/atlas/atlasresource.cpp \ + resources/atlas/atlasresource.h \ resources/attack.h \ resources/cursor.cpp \ resources/cursor.h \ @@ -1172,7 +1172,7 @@ manaplus_SOURCES += main.cpp \ resources/horseinfo.h \ resources/sprite/spritedisplay.h \ resources/sprite/spritereference.h \ - resources/textureatlas.h \ + resources/atlas/textureatlas.h \ resources/updatefile.h \ enums/resources/map/blockmask.h \ enums/resources/map/blocktype.h \ diff --git a/src/resources/atlasitem.h b/src/resources/atlas/atlasitem.h index 59485f691..37c3b9a67 100644 --- a/src/resources/atlasitem.h +++ b/src/resources/atlas/atlasitem.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RESOURCES_ATLASITEM_H -#define RESOURCES_ATLASITEM_H +#ifndef RESOURCES_ATLAS_ATLASITEM_H +#define RESOURCES_ATLAS_ATLASITEM_H #ifdef USE_OPENGL @@ -50,4 +50,4 @@ struct AtlasItem final }; #endif // USE_OPENGL -#endif // RESOURCES_ATLASITEM_H +#endif // RESOURCES_ATLAS_ATLASITEM_H diff --git a/src/resources/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp index a3836ad46..a81a6c10d 100644 --- a/src/resources/atlasmanager.cpp +++ b/src/resources/atlas/atlasmanager.cpp @@ -20,7 +20,7 @@ #ifdef USE_OPENGL -#include "resources/atlasmanager.h" +#include "resources/atlas/atlasmanager.h" #include "settings.h" @@ -33,14 +33,15 @@ #include "utils/physfsrwops.h" #include "utils/sdlcheckutils.h" -#include "resources/atlasitem.h" -#include "resources/atlasresource.h" #include "resources/dye.h" #include "resources/imagehelper.h" #include "resources/openglimagehelper.h" #include "resources/resourcemanager.h" #include "resources/sdlimagehelper.h" -#include "resources/textureatlas.h" + +#include "resources/atlas/atlasitem.h" +#include "resources/atlas/atlasresource.h" +#include "resources/atlas/textureatlas.h" #include "debug.h" diff --git a/src/resources/atlasmanager.h b/src/resources/atlas/atlasmanager.h index 83a5ad7de..b30981be6 100644 --- a/src/resources/atlasmanager.h +++ b/src/resources/atlas/atlasmanager.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RESOURCES_ATLASMANAGER_H -#define RESOURCES_ATLASMANAGER_H +#ifndef RESOURCES_ATLAS_ATLASMANAGER_H +#define RESOURCES_ATLAS_ATLASMANAGER_H #ifdef USE_OPENGL @@ -67,4 +67,4 @@ class AtlasManager final }; #endif // USE_OPENGL -#endif // RESOURCES_ATLASMANAGER_H +#endif // RESOURCES_ATLAS_ATLASMANAGER_H diff --git a/src/resources/atlasresource.cpp b/src/resources/atlas/atlasresource.cpp index 9f27446bd..8125131c6 100644 --- a/src/resources/atlasresource.cpp +++ b/src/resources/atlas/atlasresource.cpp @@ -20,12 +20,13 @@ #ifdef USE_OPENGL -#include "resources/atlasresource.h" +#include "resources/atlas/atlasresource.h" -#include "resources/atlasitem.h" -#include "resources/atlasmanager.h" #include "resources/resourcemanager.h" -#include "resources/textureatlas.h" + +#include "resources/atlas/atlasitem.h" +#include "resources/atlas/atlasmanager.h" +#include "resources/atlas/textureatlas.h" #include "debug.h" diff --git a/src/resources/atlasresource.h b/src/resources/atlas/atlasresource.h index c819dd964..d0c9d6548 100644 --- a/src/resources/atlasresource.h +++ b/src/resources/atlas/atlasresource.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RESOURCES_ATLASRESOURCE_H -#define RESOURCES_ATLASRESOURCE_H +#ifndef RESOURCES_ATLAS_ATLASRESOURCE_H +#define RESOURCES_ATLAS_ATLASRESOURCE_H #ifdef USE_OPENGL @@ -50,4 +50,4 @@ class AtlasResource final : public Resource }; #endif // USE_OPENGL -#endif // RESOURCES_ATLASRESOURCE_H +#endif // RESOURCES_ATLAS_ATLASRESOURCE_H diff --git a/src/resources/textureatlas.h b/src/resources/atlas/textureatlas.h index 89ec1bca5..1906d8bd6 100644 --- a/src/resources/textureatlas.h +++ b/src/resources/atlas/textureatlas.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RESOURCES_TEXTUREATLAS_H -#define RESOURCES_TEXTUREATLAS_H +#ifndef RESOURCES_ATLAS_TEXTUREATLAS_H +#define RESOURCES_ATLAS_TEXTUREATLAS_H #ifdef USE_OPENGL @@ -58,4 +58,4 @@ struct TextureAtlas final }; #endif // USE_OPENGL -#endif // RESOURCES_TEXTUREATLAS_H +#endif // RESOURCES_ATLAS_TEXTUREATLAS_H diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index 8d8e843df..cf16c77d6 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -29,8 +29,8 @@ #include "resources/map/walklayer.h" #ifdef USE_OPENGL -#include "resources/atlasmanager.h" -#include "resources/atlasresource.h" +#include "resources/atlas/atlasmanager.h" +#include "resources/atlas/atlasresource.h" #endif #include "resources/dye.h" #include "resources/image.h" |