Singleton managers do not need stateful classes. Changed them to namespace interfaces.

1 files changed, 18 insertions, 23 deletions

diff --git a/src/game-server/itemmanager.hpp b/src/game-server/itemmanager.hpp
index a144fa87..25e3e94b 100644
--- a/src/game-server/itemmanager.hpp
+++ b/src/game-server/itemmanager.hpp
@@ -24,31 +24,26 @@
 #ifndef _TMW_ITEMMANAGER_H
 #define _TMW_ITEMMANAGER_H
 
-#include <map>
+#include <string>
 
-#include "game-server/item.hpp"
+class ItemClass;
 
-/**
- * The Item Manager loads the item reference database
- * and also offers an API to items information, and more.
- */
-class ItemManager
+namespace ItemManager
 {
-    public:
-        /**
-         * Constructor (loads item reference file)
-         */
-        ItemManager(std::string const &itemReferenceFile);
-
-        /**
-         * Gives an Item having the demanded information.
-         */
-        ItemClass *getItem(int itemId) const;
-
-    private:
-        std::map< int, ItemClass * > mItemReference; /**< Item reference */
-};
-
-extern ItemManager *itemManager;
+    /**
+     * Loads item reference file.
+     */
+    void initialize(std::string const &);
+
+    /**
+     * Destroy item classes.
+     */
+    void deinitialize();
+
+    /**
+     * Gets the ItemClass having the given ID.
+     */
+    ItemClass *getItem(int itemId);
+}
 
 #endif