diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-07-02 14:57:03 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-07-02 14:57:03 +0300 |
commit | 1abda37d9a6173f67ee12600ca8948cd205ebad1 (patch) | |
tree | 6a1374afd218cf2277e2a3f4bae0625cff5bddc7 /src/resources | |
parent | 3f022390bacc04946dcd7cfb2be5f23a78c49c83 (diff) | |
download | manaverse-1abda37d9a6173f67ee12600ca8948cd205ebad1.tar.gz manaverse-1abda37d9a6173f67ee12600ca8948cd205ebad1.tar.bz2 manaverse-1abda37d9a6173f67ee12600ca8948cd205ebad1.tar.xz manaverse-1abda37d9a6173f67ee12600ca8948cd205ebad1.zip |
Move mapitemtype into enums directory.
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/map/map.cpp | 3 | ||||
-rw-r--r-- | src/resources/map/mapitem.cpp | 3 | ||||
-rw-r--r-- | src/resources/map/maplayer.cpp | 3 | ||||
-rw-r--r-- | src/resources/map/speciallayer.cpp | 2 | ||||
-rw-r--r-- | src/resources/mapitemtype.h | 47 | ||||
-rw-r--r-- | src/resources/mapreader.cpp | 3 |
6 files changed, 9 insertions, 52 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index 8441252e2..b96abc7d2 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -39,12 +39,13 @@ #include "enums/resources/notifytypes.h" +#include "enums/resources/map/mapitemtype.h" + #include "gui/userpalette.h" #include "particle/particle.h" #include "resources/ambientlayer.h" -#include "resources/mapitemtype.h" #include "resources/resourcemanager.h" #include "resources/subimage.h" diff --git a/src/resources/map/mapitem.cpp b/src/resources/map/mapitem.cpp index 16aa5794e..f1d045e7f 100644 --- a/src/resources/map/mapitem.cpp +++ b/src/resources/map/mapitem.cpp @@ -20,13 +20,14 @@ #include "resources/map/mapitem.h" +#include "enums/resources/map/mapitemtype.h" + #include "gui/gui.h" #include "gui/userpalette.h" #include "gui/fonts/font.h" #include "resources/image.h" -#include "resources/mapitemtype.h" #include "resources/resourcemanager.h" #include "render/graphics.h" diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp index 666df1b4a..97c2ba5f1 100644 --- a/src/resources/map/maplayer.cpp +++ b/src/resources/map/maplayer.cpp @@ -30,12 +30,13 @@ #include "being/localplayer.h" +#include "enums/resources/map/mapitemtype.h" + #include "gui/userpalette.h" #include "render/graphics.h" #include "resources/image.h" -#include "resources/mapitemtype.h" #include "resources/map/mapitem.h" #include "resources/map/maprowvertexes.h" diff --git a/src/resources/map/speciallayer.cpp b/src/resources/map/speciallayer.cpp index 811c5c03f..95ec90e35 100644 --- a/src/resources/map/speciallayer.cpp +++ b/src/resources/map/speciallayer.cpp @@ -20,7 +20,7 @@ #include "resources/map/speciallayer.h" -#include "resources/mapitemtype.h" +#include "enums/resources/map/mapitemtype.h" #include "resources/map/mapconsts.h" #include "resources/map/mapitem.h" diff --git a/src/resources/mapitemtype.h b/src/resources/mapitemtype.h deleted file mode 100644 index 2d8bb5f1c..000000000 --- a/src/resources/mapitemtype.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * The ManaPlus Client - * 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 <http://www.gnu.org/licenses/>. - */ - -#ifndef RESOURCES_MAPITEMTYPE_H -#define RESOURCES_MAPITEMTYPE_H - -namespace MapItemType -{ - enum Type - { - EMPTY = 0, - HOME = 1, - ROAD = 2, - CROSS = 3, - ARROW_UP = 4, - ARROW_DOWN = 5, - ARROW_LEFT = 6, - ARROW_RIGHT = 7, - PORTAL = 8, - MUSIC = 9, - ATTACK = 10, - PRIORITY = 11, - IGNORE_ = 12, - PICKUP = 13, - NOPICKUP = 14, - SEPARATOR = 15 - }; -} // namespace MapItemType - -#endif // RESOURCES_MAPITEMTYPE_H diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index d376ddbb4..54ee95ea5 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -28,6 +28,8 @@ #endif #include "logger.h" +#include "enums/resources/map/mapitemtype.h" + #include "resources/map/map.h" #include "resources/map/mapconsts.h" #include "resources/map/mapheights.h" @@ -36,7 +38,6 @@ #include "resources/animation.h" #include "resources/beingcommon.h" #include "resources/image.h" -#include "resources/mapitemtype.h" #include "resources/resourcemanager.h" #ifdef USE_OPENGL |