diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-12-29 02:26:07 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-12-29 02:26:07 +0300 |
| commit | 565a015b5fb29b7f6c3696c38b4ce3ae3eb1b07c (patch) | |
| tree | 41171ba7879af0e746815dfcc8f237b1b3a6d8be | |
| parent | 75802940ea0f10c4ecce5ab55140c38a164ba574 (diff) | |
| download | plus-565a015b5fb29b7f6c3696c38b4ce3ae3eb1b07c.tar.gz plus-565a015b5fb29b7f6c3696c38b4ce3ae3eb1b07c.tar.bz2 plus-565a015b5fb29b7f6c3696c38b4ce3ae3eb1b07c.tar.xz plus-565a015b5fb29b7f6c3696c38b4ce3ae3eb1b07c.zip | |
Move flooritem into being directory.
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/actormanager.h | 2 | ||||
| -rw-r--r-- | src/being/flooritem.cpp (renamed from src/flooritem.cpp) | 2 | ||||
| -rw-r--r-- | src/being/flooritem.h (renamed from src/flooritem.h) | 6 | ||||
| -rw-r--r-- | src/itemsoundmanager.cpp | 2 | ||||
| -rw-r--r-- | src/net/playerhandler.h | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b483657e9..7be36dfbb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -916,8 +916,8 @@ SET(SRCS equipment.h eventsmanager.cpp eventsmanager.h - flooritem.cpp - flooritem.h + being/flooritem.cpp + being/flooritem.h game.cpp game.h gamemodifiers.cpp diff --git a/src/Makefile.am b/src/Makefile.am index a555b0a06..eb342132e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -757,8 +757,8 @@ manaplus_SOURCES += main.cpp \ beingequipbackend.h \ resources/item/shopitem.cpp \ resources/item/shopitem.h \ - flooritem.cpp \ - flooritem.h \ + being/flooritem.cpp \ + being/flooritem.h \ game.cpp \ game.h \ gamemodifiers.cpp \ diff --git a/src/actormanager.h b/src/actormanager.h index 4a50e4571..9d9675bca 100644 --- a/src/actormanager.h +++ b/src/actormanager.h @@ -23,7 +23,7 @@ #ifndef ACTORMANAGER_H #define ACTORMANAGER_H -#include "flooritem.h" +#include "being/flooritem.h" #include "enums/simpletypes/allowsort.h" #include "enums/simpletypes/allplayers.h" diff --git a/src/flooritem.cpp b/src/being/flooritem.cpp index 49a64ff43..5a6c00005 100644 --- a/src/flooritem.cpp +++ b/src/being/flooritem.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "flooritem.h" +#include "being/flooritem.h" #include "configuration.h" diff --git a/src/flooritem.h b/src/being/flooritem.h index 71ae94b6f..5e8d4effa 100644 --- a/src/flooritem.h +++ b/src/being/flooritem.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef FLOORITEM_H -#define FLOORITEM_H +#ifndef BEING_FLOORITEM_H +#define BEING_FLOORITEM_H #include "enums/simpletypes/damaged.h" #include "enums/simpletypes/identified.h" @@ -144,4 +144,4 @@ class FloorItem final : public ActorSprite bool mHighlight; }; -#endif // FLOORITEM_H +#endif // BEING_FLOORITEM_H diff --git a/src/itemsoundmanager.cpp b/src/itemsoundmanager.cpp index 6c3bb0a85..565a4d988 100644 --- a/src/itemsoundmanager.cpp +++ b/src/itemsoundmanager.cpp @@ -20,9 +20,9 @@ #include "itemsoundmanager.h" -#include "flooritem.h" #include "soundmanager.h" +#include "being/flooritem.h" #include "being/localplayer.h" #include "resources/iteminfo.h" diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index 21c06b8bb..6930a0d48 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -23,7 +23,7 @@ #ifndef NET_PLAYERHANDLER_H #define NET_PLAYERHANDLER_H -#include "flooritem.h" +#include "being/flooritem.h" #include "enums/being/attributes.h" #include "enums/being/beingaction.h" |