Core/ObjectMgr: Refactor sItemStorage

2 files changed, 10 insertions, 3 deletions

diff --git a/src/server/shared/Database/SQLStorage.cpp b/src/server/shared/Database/SQLStorage.cpp
index 6fcb7b1af9d..0ed1986486e 100755
--- a/src/server/shared/Database/SQLStorage.cpp
+++ b/src/server/shared/Database/SQLStorage.cpp
@@ -25,14 +25,11 @@ const char CreatureDataAddonInfofmt[]="iiiiiis";
 const char CreatureInfoAddonInfofmt[]="iiiiiis";
 const char GameObjectInfosrcfmt[]="iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiissi";
 const char GameObjectInfodstfmt[]="iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiisii";
-const char ItemPrototypesrcfmt[]="iiiisiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiffiffiiiiiiiiiifiiifiiiiiifiiiiiifiiiiiifiiiiiifiiiisiiiiiiiiiiiiiiiiiiiiiiiiifiiisiiiii";
-const char ItemPrototypedstfmt[]="iiiisiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiffiffiiiiiiiiiifiiifiiiiiifiiiiiifiiiiiifiiiiiifiiiisiiiiiiiiiiiiiiiiiiiiiiiiifiiiiiiiii";
 
 SQLStorage sCreatureStorage(CreatureInfosrcfmt, CreatureInfodstfmt, "entry","creature_template");
 SQLStorage sCreatureDataAddonStorage(CreatureDataAddonInfofmt,"guid","creature_addon");
 SQLStorage sCreatureInfoAddonStorage(CreatureInfoAddonInfofmt,"entry","creature_template_addon");
 SQLStorage sGOStorage(GameObjectInfosrcfmt, GameObjectInfodstfmt, "entry","gameobject_template");
-SQLStorage sItemStorage(ItemPrototypesrcfmt, ItemPrototypedstfmt, "entry","item_template");
 
 void SQLStorage::Free ()
 {
diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h
index a6a76439bdb..2e5d9a12ad7 100755
--- a/src/server/shared/Utilities/Util.h
+++ b/src/server/shared/Utilities/Util.h
@@ -24,6 +24,16 @@
 #include <string>
 #include <vector>
 
+// Searcher for map of structs
+template<typename T, class S> struct Finder
+{
+    T val_;
+    T S::* idMember_;
+
+    Finder(T val, T S::* idMember) : val_(val), idMember_(idMember) {}
+    bool operator()(const std::pair<int, S> &obj) { return obj.second.*idMember_ == val_; }
+};
+
 struct Tokens: public std::vector<char*>
 {
     Tokens(const std::string &src, const char sep, uint32 vectorReserve = 0);