From 467455bf7907411918d8fb6f4113eb95df443a29 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 13 May 2014 16:32:55 +0300
Subject: Move pickup flags into separate file.

---
 src/CMakeLists.txt              |  1 +
 src/Makefile.am                 |  1 +
 src/being/localplayer.cpp       | 13 ++++++------
 src/being/localplayer.h         | 14 -------------
 src/being/pickup.h              | 45 +++++++++++++++++++++++++++++++++++++++++
 src/net/ea/inventoryhandler.cpp |  3 ++-
 6 files changed, 56 insertions(+), 21 deletions(-)
 create mode 100644 src/being/pickup.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1f9171258..f3f37cd0d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -709,6 +709,7 @@ SET(SRCS
     localconsts.h
     being/localplayer.cpp
     being/localplayer.h
+    being/pickup.h
     logger.cpp
     logger.h
     main.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 77971c35b..630fbb278 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -798,6 +798,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      localconsts.h \
 	      being/localplayer.cpp \
 	      being/localplayer.h \
+	      being/pickup.h \
 	      logger.cpp \
 	      logger.h \
 	      main.cpp \
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 37a960dae..9ba8b236b 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -36,6 +36,7 @@
 #include "resources/map/walklayer.h"
 
 #include "being/attributes.h"
+#include "being/pickup.h"
 #include "being/playerinfo.h"
 #include "being/playerrelations.h"
 
@@ -820,27 +821,27 @@ void LocalPlayer::pickedUp(const ItemInfo &itemInfo, const int amount,
         const char* msg = nullptr;
         switch (fail)
         {
-            case PICKUP_BAD_ITEM:
+            case Pickup::BAD_ITEM:
                 // TRANSLATORS: pickup error message
                 msg = N_("Tried to pick up nonexistent item.");
                 break;
-            case PICKUP_TOO_HEAVY:
+            case Pickup::TOO_HEAVY:
                 // TRANSLATORS: pickup error message
                 msg = N_("Item is too heavy.");
                 break;
-            case PICKUP_TOO_FAR:
+            case Pickup::TOO_FAR:
                 // TRANSLATORS: pickup error message
                 msg = N_("Item is too far away.");
                 break;
-            case PICKUP_INV_FULL:
+            case Pickup::INV_FULL:
                 // TRANSLATORS: pickup error message
                 msg = N_("Inventory is full.");
                 break;
-            case PICKUP_STACK_FULL:
+            case Pickup::STACK_FULL:
                 // TRANSLATORS: pickup error message
                 msg = N_("Stack is too big.");
                 break;
-            case PICKUP_DROP_STEAL:
+            case Pickup::DROP_STEAL:
                 // TRANSLATORS: pickup error message
                 msg = N_("Item belongs to someone else.");
                 break;
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index a8fd829d3..ee57dc96a 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -42,20 +42,6 @@ class FloorItem;
 class Map;
 class OkDialog;
 
-/**
- * Reasons an item can fail to be picked up.
- */
-enum
-{
-    PICKUP_OKAY = 0,
-    PICKUP_BAD_ITEM,
-    PICKUP_TOO_HEAVY,
-    PICKUP_TOO_FAR,
-    PICKUP_INV_FULL,
-    PICKUP_STACK_FULL,
-    PICKUP_DROP_STEAL
-};
-
 /**
  * The local player character.
  */
diff --git a/src/being/pickup.h b/src/being/pickup.h
new file mode 100644
index 000000000..b15070e58
--- /dev/null
+++ b/src/being/pickup.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-2014  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,
+        BAD_ITEM,
+        TOO_HEAVY,
+        TOO_FAR,
+        INV_FULL,
+        STACK_FULL,
+        DROP_STEAL
+    };
+}
+
+#endif  // BEING_PICKUP_H
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 46f87f089..21ad9139a 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -27,6 +27,7 @@
 
 #include "being/attributes.h"
 #include "being/localplayer.h"
+#include "being/pickup.h"
 
 #include "net/messagein.h"
 
@@ -321,7 +322,7 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
         if (player_node)
         {
             player_node->pickedUp(itemInfo, amount,
-                identified, floorId, PICKUP_OKAY);
+                identified, floorId, Pickup::OKAY);
         }
 
         if (inventory)
-- 
cgit v1.2.3-70-g09d2