From 46816ad7947e3f45e0222a3fafb9c22e087296a6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 6 Jan 2015 19:11:52 +0300 Subject: Move actortype.h into enums directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/being/actorsprite.h | 2 +- src/being/actortype.h | 43 ------------------------------------------- src/enums/being/actortype.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 src/being/actortype.h create mode 100644 src/enums/being/actortype.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fdc3f45fa..8b2e18f87 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -806,7 +806,7 @@ SET(SRCS being/actor.h being/actorsprite.cpp being/actorsprite.h - being/actortype.h + enums/being/actortype.h enums/being/attributes.h listeners/actorspritelistener.h listeners/arrowslistener.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 21862ee6e..0c9bf28c1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -928,7 +928,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ being/actor.h \ being/actorsprite.cpp \ being/actorsprite.h \ - being/actortype.h \ + enums/being/actortype.h \ enums/being/attributes.h \ listeners/actorspritelistener.h \ listeners/arrowslistener.cpp \ diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h index abc0e8690..b9889490c 100644 --- a/src/being/actorsprite.h +++ b/src/being/actorsprite.h @@ -26,9 +26,9 @@ #include "resources/map/mapconsts.h" #include "being/actor.h" -#include "being/actortype.h" #include "being/compoundsprite.h" +#include "enums/being/actortype.h" #include "enums/being/targetcursorsize.h" #include "enums/being/targetcursortype.h" diff --git a/src/being/actortype.h b/src/being/actortype.h deleted file mode 100644 index 85662174e..000000000 --- a/src/being/actortype.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 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 BEING_ACTORTYPE_H -#define BEING_ACTORTYPE_H - -namespace ActorType -{ - enum Type - { - Unknown = 0, - Player, - Npc, - Monster, - FloorItem, - Portal, - LocalPet, - Pet, - Avatar, - Mercenary, - Homunculus - }; -} // namespace ActorType - -#endif // BEING_ACTORTYPE_H diff --git a/src/enums/being/actortype.h b/src/enums/being/actortype.h new file mode 100644 index 000000000..c6123a7f4 --- /dev/null +++ b/src/enums/being/actortype.h @@ -0,0 +1,43 @@ +/* + * The ManaPlus Client + * Copyright (C) 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 ENUMS_BEING_ACTORTYPE_H +#define ENUMS_BEING_ACTORTYPE_H + +namespace ActorType +{ + enum Type + { + Unknown = 0, + Player, + Npc, + Monster, + FloorItem, + Portal, + LocalPet, + Pet, + Avatar, + Mercenary, + Homunculus + }; +} // namespace ActorType + +#endif // ENUMS_BEING_ACTORTYPE_H -- cgit v1.2.3-60-g2f50