summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-06 18:36:28 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-06 18:36:28 +0300
commit0fa972c8b0640aaa5f3f3503a59062948c6e330d (patch)
tree9340a808b399163c0c9f854796f23d27661f74b7 /src/being
parent3839572c35941ef829ba1be6b70bc1a584a67a36 (diff)
downloadmv-0fa972c8b0640aaa5f3f3503a59062948c6e330d.tar.gz
mv-0fa972c8b0640aaa5f3f3503a59062948c6e330d.tar.bz2
mv-0fa972c8b0640aaa5f3f3503a59062948c6e330d.tar.xz
mv-0fa972c8b0640aaa5f3f3503a59062948c6e330d.zip
Move pikcup.h into enums directory.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/localplayer.h2
-rw-r--r--src/being/pickup.h48
2 files changed, 1 insertions, 49 deletions
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index 60dc69410..bf342e8c3 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -25,7 +25,7 @@
#include "being/being.h"
-#include "being/pickup.h"
+#include "enums/being/pickup.h"
#include "gui/userpalette.h"
diff --git a/src/being/pickup.h b/src/being/pickup.h
deleted file mode 100644
index 371c04ba4..000000000
--- a/src/being/pickup.h
+++ /dev/null
@@ -1,48 +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_PICKUP_H
-#define BEING_PICKUP_H
-
-#include "localconsts.h"
-
-namespace Pickup
-{
- /**
- * Reasons an item can fail to be picked up.
- */
- enum Type
- {
- OKAY = 0,
- UNKNOWN,
- BAD_ITEM,
- TOO_HEAVY,
- TOO_FAR,
- INV_FULL,
- STACK_FULL,
- DROP_STEAL,
- MAX_AMOUNT,
- STACK_AMOUNT
- };
-} // namespace Pickup
-
-#endif // BEING_PICKUP_H