Floor items are now removed after a (configurable) time.

Reviewed-by: Thorbjorn Lindeijer

2 files changed, 29 insertions, 4 deletions

diff --git a/src/game-server/item.cpp b/src/game-server/item.cpp
index 2737be04..91d847d7 100644
--- a/src/game-server/item.cpp
+++ b/src/game-server/item.cpp
@@ -24,9 +24,12 @@
 
 #include "game-server/item.hpp"
 
+#include "common/configuration.hpp"
 #include "game-server/being.hpp"
+#include "game-server/state.hpp"
 #include "scripting/script.hpp"
 
+
 ItemType itemTypeFromString (const std::string &name)
 {
     static std::map<const std::string, ItemType> table;
@@ -130,3 +133,22 @@ bool ItemClass::use(Being *itemUser)
     mModifiers.applyAttributes(itemUser);
     return true;
 }
+
+
+Item::Item(ItemClass *type, int amount)
+          : Actor(OBJECT_ITEM), mType(type), mAmount(amount)
+{
+    mLifetime = Configuration::getValue("floorItemDecayTime", 0) * 10;
+}
+
+void Item::update()
+{
+    if (mLifetime)
+    {
+        mLifetime--;
+        if (!mLifetime)
+        {
+            GameState::enqueueRemove(this);
+        }
+    }
+}
diff --git a/src/game-server/item.hpp b/src/game-server/item.hpp
index 777f5057..4aa84c9c 100644
--- a/src/game-server/item.hpp
+++ b/src/game-server/item.hpp
@@ -269,12 +269,14 @@ class ItemClass
         unsigned mAttackRange;  /**< Attack range when used as a weapon */
 };
 
+/**
+* Class for an item stack laying on the floor in the game world
+*/
+
 class Item : public Actor
 {
     public:
-        Item(ItemClass *type, int amount)
-          : Actor(OBJECT_ITEM), mType(type), mAmount(amount)
-        {}
+        Item(ItemClass *type, int amount);
 
         ItemClass *getItemClass() const
         { return mType; }
@@ -282,11 +284,12 @@ class Item : public Actor
         int getAmount() const
         { return mAmount; }
 
-        virtual void update() {}
+        virtual void update();
 
     private:
         ItemClass *mType;
         unsigned char mAmount;
+        int mLifetime;
 };
 
 #endif