diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-01-06 18:31:37 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-01-06 18:31:37 +0300 |
| commit | 3839572c35941ef829ba1be6b70bc1a584a67a36 (patch) | |
| tree | f1158c59f8c36001dcc4efc335235fe6f3b50bbc /src/being | |
| parent | 1db4d18ed1c04548ce8414adfb4e7cf830b39279 (diff) | |
| download | mv-3839572c35941ef829ba1be6b70bc1a584a67a36.tar.gz mv-3839572c35941ef829ba1be6b70bc1a584a67a36.tar.bz2 mv-3839572c35941ef829ba1be6b70bc1a584a67a36.tar.xz mv-3839572c35941ef829ba1be6b70bc1a584a67a36.zip | |
Move beingaction.h into enums directory.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/being.h | 8 | ||||
| -rw-r--r-- | src/being/beingaction.h | 45 |
2 files changed, 4 insertions, 49 deletions
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 <map> 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 <http://www.gnu.org/licenses/>. - */ - -#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 |