*Merge more contents from SD2. By nofantasy. Also backport some content from TC2.

--HG--
branch : trunk

src/game/ObjectMgr.cpp

@@ -7257,6 +7257,16 @@ CreatureInfo const *GetCreatureInfo(uint32 id)
     return objmgr.GetCreatureTemplate(id);
 }
 
+CreatureInfo const* GetCreatureTemplateStore(uint32 entry)
+{
+    return sCreatureStorage.LookupEntry<CreatureInfo>(entry);
+}
+
+Quest const* GetQuestTemplateStore(uint32 entry)
+{
+    return objmgr.GetQuestTemplate(entry);
+}
+
 void ObjectMgr::LoadTransportEvents()
 {
 

src/game/ObjectMgr.h

@@ -907,6 +907,8 @@ TRINITY_DLL_SPEC uint32 GetScriptId(const char *name);
 TRINITY_DLL_SPEC ObjectMgr::ScriptNameMap& GetScriptNames();
 TRINITY_DLL_SPEC GameObjectInfo const *GetGameObjectInfo(uint32 id);
 TRINITY_DLL_SPEC CreatureInfo const *GetCreatureInfo(uint32 id);
+TRINITY_DLL_SPEC CreatureInfo const* GetCreatureTemplateStore(uint32 entry);
+TRINITY_DLL_SPEC Quest const* GetQuestTemplateStore(uint32 entry);
 
 #endif