From d7db223d0663df45756b184307a77eb11aba8cec Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 20 Dec 2015 18:07:37 +0300 Subject: Move spritedirection into enums directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/effectmanager.h | 3 ++- src/enums/resources/spritedirection.h | 43 +++++++++++++++++++++++++++++++++++ src/resources/action.h | 2 +- src/resources/db/itemdb.cpp | 3 ++- src/resources/iteminfo.cpp | 2 +- src/resources/sprite/spritedef.h | 2 +- src/resources/spritedirection.h | 43 ----------------------------------- 9 files changed, 52 insertions(+), 50 deletions(-) create mode 100644 src/enums/resources/spritedirection.h delete mode 100644 src/resources/spritedirection.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 800ae25a8..571f910fd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -737,7 +737,7 @@ SET(SRCS const/resources/spriteaction.h resources/sprite/spritedef.h resources/sprite/spritedef.cpp - resources/spritedirection.h + enums/resources/spritedirection.h resources/spritedisplay.h resources/spritereference.h resources/subimage.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 3e036fe7b..d980af308 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -386,7 +386,7 @@ SRC += events/actionevent.h \ const/resources/spriteaction.h \ resources/sprite/spritedef.cpp \ resources/sprite/spritedef.h \ - resources/spritedirection.h \ + enums/resources/spritedirection.h \ resources/subimage.cpp \ resources/subimage.h \ resources/surfaceimagehelper.cpp \ diff --git a/src/effectmanager.h b/src/effectmanager.h index a76899e25..d72a7cc96 100644 --- a/src/effectmanager.h +++ b/src/effectmanager.h @@ -23,10 +23,11 @@ #ifndef EFFECTMANAGER_H #define EFFECTMANAGER_H +#include "enums/resources/spritedirection.h" + #include "particle/particletimer.h" #include "resources/effectdescription.h" -#include "resources/spritedirection.h" #include #include diff --git a/src/enums/resources/spritedirection.h b/src/enums/resources/spritedirection.h new file mode 100644 index 000000000..92c7ac09e --- /dev/null +++ b/src/enums/resources/spritedirection.h @@ -0,0 +1,43 @@ +/* + * 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_SPRITEDIRECTION_H +#define RESOURCES_SPRITEDIRECTION_H + +namespace SpriteDirection +{ + enum Type + { + DEFAULT = 0, + UP = 1, + DOWN = 2, + LEFT = 3, + RIGHT = 4, + UPLEFT = 5, + UPRIGHT = 6, + DOWNLEFT = 7, + DOWNRIGHT = 8, + INVALID + }; +} // namespace SpriteDirection + +#endif // RESOURCES_SPRITEDIRECTION_H diff --git a/src/resources/action.h b/src/resources/action.h index d9426d8c1..c73c96c93 100644 --- a/src/resources/action.h +++ b/src/resources/action.h @@ -23,7 +23,7 @@ #ifndef RESOURCES_ACTION_H #define RESOURCES_ACTION_H -#include "resources/spritedirection.h" +#include "enums/resources/spritedirection.h" #include diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index 42c2f645b..5429698f1 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -27,10 +27,11 @@ #include "configuration.h" #include "logger.h" +#include "enums/resources/spritedirection.h" + #include "resources/beingcommon.h" #include "resources/iteminfo.h" #include "resources/itemtypemapdata.h" -#include "resources/spritedirection.h" #include "resources/spritereference.h" #include "resources/db/itemdbstat.h" diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index 03f0ad422..2d48ccd66 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -26,7 +26,7 @@ #include "const/resources/map/map.h" -#include "resources/spritedirection.h" +#include "enums/resources/spritedirection.h" #include "resources/db/colordb.h" #include "resources/db/itemdb.h" diff --git a/src/resources/sprite/spritedef.h b/src/resources/sprite/spritedef.h index 02ce98ff9..cab987668 100644 --- a/src/resources/sprite/spritedef.h +++ b/src/resources/sprite/spritedef.h @@ -25,7 +25,7 @@ #include "resources/resource.h" -#include "resources/spritedirection.h" +#include "enums/resources/spritedirection.h" #include "utils/xml.h" diff --git a/src/resources/spritedirection.h b/src/resources/spritedirection.h deleted file mode 100644 index 92c7ac09e..000000000 --- a/src/resources/spritedirection.h +++ /dev/null @@ -1,43 +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_SPRITEDIRECTION_H -#define RESOURCES_SPRITEDIRECTION_H - -namespace SpriteDirection -{ - enum Type - { - DEFAULT = 0, - UP = 1, - DOWN = 2, - LEFT = 3, - RIGHT = 4, - UPLEFT = 5, - UPRIGHT = 6, - DOWNLEFT = 7, - DOWNRIGHT = 8, - INVALID - }; -} // namespace SpriteDirection - -#endif // RESOURCES_SPRITEDIRECTION_H -- cgit v1.2.3-60-g2f50