diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-12-20 18:12:53 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-12-20 18:12:53 +0300 |
| commit | 444be435a9ac4da0a8bb5217700cebeaa0c7066c (patch) | |
| tree | 6bd4662275c23eb57c4cf0ec0606f0e13851f00d | |
| parent | d7db223d0663df45756b184307a77eb11aba8cec (diff) | |
| download | manaplus-444be435a9ac4da0a8bb5217700cebeaa0c7066c.tar.gz manaplus-444be435a9ac4da0a8bb5217700cebeaa0c7066c.tar.bz2 manaplus-444be435a9ac4da0a8bb5217700cebeaa0c7066c.tar.xz manaplus-444be435a9ac4da0a8bb5217700cebeaa0c7066c.zip | |
Move spritedisplay.h into sprite directory.
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/resources/beinginfo.h | 3 | ||||
| -rw-r--r-- | src/resources/iteminfo.h | 3 | ||||
| -rw-r--r-- | src/resources/sprite/spritedisplay.h (renamed from src/resources/spritedisplay.h) | 6 |
5 files changed, 10 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 571f910fd..ac9d455ad 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -738,7 +738,7 @@ SET(SRCS resources/sprite/spritedef.h resources/sprite/spritedef.cpp enums/resources/spritedirection.h - resources/spritedisplay.h + resources/sprite/spritedisplay.h resources/spritereference.h resources/subimage.cpp resources/subimage.h @@ -1375,7 +1375,7 @@ SET(DYE_CMD_SRCS resources/updatefile.h resources/sprite/spritedef.cpp resources/sprite/spritedef.h - resources/spritedisplay.h + resources/sprite/spritedisplay.h resources/spritereference.h utils/files.cpp utils/files.h diff --git a/src/Makefile.am b/src/Makefile.am index d980af308..bb1435f84 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1170,7 +1170,7 @@ manaplus_SOURCES += main.cpp \ resources/emotesprite.h \ resources/equipmentslots.h \ resources/horseinfo.h \ - resources/spritedisplay.h \ + resources/sprite/spritedisplay.h \ resources/spritereference.h \ resources/textureatlas.h \ resources/updatefile.h \ diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h index 6a84723a3..139c5e5c7 100644 --- a/src/resources/beinginfo.h +++ b/src/resources/beinginfo.h @@ -33,7 +33,8 @@ #include "resources/beingmenuitem.h" #include "resources/cursor.h" #include "resources/soundinfo.h" -#include "resources/spritedisplay.h" + +#include "resources/sprite/spritedisplay.h" struct Attack; diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 6ab059d7c..12b1019c1 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -31,7 +31,8 @@ #include "resources/cursor.h" #include "resources/itemtype.h" #include "resources/soundinfo.h" -#include "resources/spritedisplay.h" + +#include "resources/sprite/spritedisplay.h" #include "utils/intmap.h" diff --git a/src/resources/spritedisplay.h b/src/resources/sprite/spritedisplay.h index edeee10c8..a3abcd928 100644 --- a/src/resources/spritedisplay.h +++ b/src/resources/sprite/spritedisplay.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RESOURCES_SPRITEDISPLAY_H -#define RESOURCES_SPRITEDISPLAY_H +#ifndef RESOURCES_SPRITE_SPRITEDISPLAY_H +#define RESOURCES_SPRITE_SPRITEDISPLAY_H #include "utils/stringvector.h" @@ -43,4 +43,4 @@ struct SpriteDisplay final StringVect particles; }; -#endif // RESOURCES_SPRITEDISPLAY_H +#endif // RESOURCES_SPRITE_SPRITEDISPLAY_H |