Item id based inventory, support for weapon dealers.

1 files changed, 37 insertions, 4 deletions

diff --git a/src/core/item.h b/src/core/item.h
index 6c99270..ec0d6be 100644
--- a/src/core/item.h
+++ b/src/core/item.h
@@ -23,14 +23,16 @@ public:
 	
 	Item(const Info *info);
 	
-	/// copy constructor
-	Item(const Item &other);
-	
 	~Item();
 	
 	/* ---- inspectors --------------------------------------------- */
 	
 	/**
+	 * @brief returns the item id
+	 * */
+	inline unsigned int id() const { return item_id; }
+	
+	/**
 	 * @brief associated amount
 	 */
 	 inline long amount() const { return item_amount; }
@@ -69,6 +71,13 @@ public:
 	}
 	
 	/**
+	 * @brief returns true if the Unique flag is set
+	 */
+	inline const bool unique() const {
+		return ((item_flags & (unsigned int) Unique) == (unsigned int) Unique);
+	}
+	
+	/**
 	 * @brief return true if the dirty flag is set
 	 * */
 	inline const bool dirty() const {
@@ -76,6 +85,21 @@ public:
 	}
 	
 	/* ---- mutators ----------------------------------------------- */
+	
+	/**
+	 * @brief set item id
+	 * This should never be called from within the game module,
+	 * it is used by Inventory to keep track of unique items
+	 */
+	void set_id(const unsigned int id);
+	
+	/**
+	 * @brief set item info
+	 * This should never be called from within the game module,
+	 * it essentially changes the item type and is used by NetConnection
+	 * for inventory householding.
+	 */
+	void set_info(const Info *info);
 
 	/**
 	 * @brief set associated amount
@@ -98,6 +122,13 @@ public:
 	void set_price(const long price);
 	
 	/**
+	 * @brief set all item flags
+	 */
+	inline void set_flags(const unsigned int flags) {
+		item_flags = flags;
+	}
+	
+	/**
 	 * @brief set item flag
 	 */
 	inline void set_flag(Flags flag) {
@@ -115,7 +146,7 @@ public:
 	 * @brief set the dirty flag
 	 * */
 	inline void set_dirty(const bool dirty = true) {
-		item_dirty = true;
+		item_dirty = dirty;
 	}
 	
 	/* ---- serializers -------------------------------------------- */
@@ -136,6 +167,8 @@ private:
 	unsigned int		item_flags;
 	
 	bool			item_dirty;
+	
+	unsigned int		item_id;
 };
 
 } // namespace core