From 3839572c35941ef829ba1be6b70bc1a584a67a36 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 6 Jan 2015 18:31:37 +0300 Subject: Move beingaction.h into enums directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/being/being.h | 8 ++++---- src/being/beingaction.h | 45 ------------------------------------------- src/enums/being/beingaction.h | 45 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 src/being/beingaction.h create mode 100644 src/enums/being/beingaction.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b47099ec9..a4ac5159d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -832,7 +832,7 @@ SET(SRCS avatar.h being/being.cpp being/being.h - being/beingaction.h + enums/being/beingaction.h being/beingcacheentry.h being/beingdirection.h being/beingflag.h diff --git a/src/Makefile.am b/src/Makefile.am index 6bcd74d67..eed8cadd1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -954,7 +954,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ avatar.h \ being/being.cpp \ being/being.h \ - being/beingaction.h \ + enums/being/beingaction.h \ being/beingcacheentry.h \ being/beingdirection.h \ being/beingflag.h \ diff --git a/src/being/being.h b/src/being/being.h index 63bce313e..c99f5824d 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -27,13 +27,13 @@ #include "position.h" -#include "listeners/configlistener.h" - -#include "being/beingaction.h" +#include "being/actorsprite.h" #include "being/beingdirection.h" #include "being/gender.h" -#include "being/actorsprite.h" +#include "enums/being/beingaction.h" + +#include "listeners/configlistener.h" #include diff --git a/src/being/beingaction.h b/src/being/beingaction.h deleted file mode 100644 index b800762a9..000000000 --- a/src/being/beingaction.h +++ /dev/null @@ -1,45 +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 BEING_BEINGACTION_H -#define BEING_BEINGACTION_H - -namespace BeingAction -{ - /** - * Action the being is currently performing - * WARNING: Has to be in sync with the same enum in the Being class - * of the server! - */ - enum Action - { - STAND = 0, - MOVE, - ATTACK, - SIT, - DEAD, - HURT, - SPAWN - }; -} // namespace BeingAction - -#endif // BEING_BEINGACTION_H diff --git a/src/enums/being/beingaction.h b/src/enums/being/beingaction.h new file mode 100644 index 000000000..aa09ff68c --- /dev/null +++ b/src/enums/being/beingaction.h @@ -0,0 +1,45 @@ +/* + * 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 ENUMS_BEING_BEINGACTION_H +#define ENUMS_BEING_BEINGACTION_H + +namespace BeingAction +{ + /** + * Action the being is currently performing + * WARNING: Has to be in sync with the same enum in the Being class + * of the server! + */ + enum Action + { + STAND = 0, + MOVE, + ATTACK, + SIT, + DEAD, + HURT, + SPAWN + }; +} // namespace BeingAction + +#endif // ENUMS_BEING_BEINGACTION_H -- cgit v1.2.3-60-g2f50