summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-06 19:11:52 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-06 19:11:52 +0300
commit46816ad7947e3f45e0222a3fafb9c22e087296a6 (patch)
tree290c8fb32c684d1679122acf2341183c2f33c93a /src/being
parente27d9f9295df3e5508737493425273e6d2191138 (diff)
downloadmv-46816ad7947e3f45e0222a3fafb9c22e087296a6.tar.gz
mv-46816ad7947e3f45e0222a3fafb9c22e087296a6.tar.bz2
mv-46816ad7947e3f45e0222a3fafb9c22e087296a6.tar.xz
mv-46816ad7947e3f45e0222a3fafb9c22e087296a6.zip
Move actortype.h into enums directory.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/actorsprite.h2
-rw-r--r--src/being/actortype.h43
2 files changed, 1 insertions, 44 deletions
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 <http://www.gnu.org/licenses/>.
- */
-
-#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