From 444be435a9ac4da0a8bb5217700cebeaa0c7066c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 20 Dec 2015 18:12:53 +0300 Subject: Move spritedisplay.h into sprite directory. --- src/CMakeLists.txt | 4 ++-- src/Makefile.am | 2 +- src/resources/beinginfo.h | 3 ++- src/resources/iteminfo.h | 3 ++- src/resources/sprite/spritedisplay.h | 46 ++++++++++++++++++++++++++++++++++++ src/resources/spritedisplay.h | 46 ------------------------------------ 6 files changed, 53 insertions(+), 51 deletions(-) create mode 100644 src/resources/sprite/spritedisplay.h delete mode 100644 src/resources/spritedisplay.h (limited to 'src') 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/sprite/spritedisplay.h b/src/resources/sprite/spritedisplay.h new file mode 100644 index 000000000..a3abcd928 --- /dev/null +++ b/src/resources/sprite/spritedisplay.h @@ -0,0 +1,46 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef RESOURCES_SPRITE_SPRITEDISPLAY_H +#define RESOURCES_SPRITE_SPRITEDISPLAY_H + +#include "utils/stringvector.h" + +struct SpriteReference; + +struct SpriteDisplay final +{ + SpriteDisplay() : + image(), + floor(), + sprites(), + particles() + { + } + + std::string image; + std::string floor; + std::vector sprites; + StringVect particles; +}; + +#endif // RESOURCES_SPRITE_SPRITEDISPLAY_H diff --git a/src/resources/spritedisplay.h b/src/resources/spritedisplay.h deleted file mode 100644 index edeee10c8..000000000 --- a/src/resources/spritedisplay.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2015 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef RESOURCES_SPRITEDISPLAY_H -#define RESOURCES_SPRITEDISPLAY_H - -#include "utils/stringvector.h" - -struct SpriteReference; - -struct SpriteDisplay final -{ - SpriteDisplay() : - image(), - floor(), - sprites(), - particles() - { - } - - std::string image; - std::string floor; - std::vector sprites; - StringVect particles; -}; - -#endif // RESOURCES_SPRITEDISPLAY_H -- cgit v1.2.3-70-g09d2