From 6d1924cee8e9e906ec03d4e2ff64175ea9d44ce4 Mon Sep 17 00:00:00 2001 From: leak Date: Thu, 28 Apr 2011 23:03:02 +0200 Subject: Removing SQLStorage class leftovers --- src/server/game/AI/EventAI/CreatureEventAIMgr.cpp | 1 - src/server/game/AI/SmartScripts/SmartAI.cpp | 1 - src/server/game/AI/SmartScripts/SmartScript.cpp | 1 - src/server/game/AI/SmartScripts/SmartScriptMgr.cpp | 1 - src/server/game/AuctionHouse/AuctionHouseMgr.cpp | 1 - src/server/game/Globals/ObjectMgr.cpp | 38 ---------------------- src/server/game/Globals/ObjectMgr.h | 1 - src/server/game/Instances/InstanceSaveMgr.cpp | 1 - src/server/game/PrecompiledHeaders/gamePCH.h | 1 - src/server/game/Spells/SpellMgr.h | 1 - src/server/game/Texts/CreatureTextMgr.cpp | 1 - src/server/game/Tickets/TicketMgr.cpp | 2 -- src/server/game/Tools/PlayerDump.cpp | 1 - 13 files changed, 51 deletions(-) (limited to 'src/server/game') diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp index da9daa9f7d0..175fee02317 100755 --- a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp +++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp @@ -18,7 +18,6 @@ #include "Common.h" #include "DatabaseEnv.h" -#include "SQLStorage.h" #include "CreatureEventAI.h" #include "CreatureEventAIMgr.h" #include "ObjectMgr.h" diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 4186f5e7565..f6eea40eb4b 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -16,7 +16,6 @@ */ #include "DatabaseEnv.h" -#include "SQLStorage.h" #include "ObjectMgr.h" #include "ObjectDefines.h" #include "GridDefines.h" diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index dee4b4c2c71..732e4a42dbb 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -16,7 +16,6 @@ */ #include "DatabaseEnv.h" -#include "SQLStorage.h" #include "ObjectMgr.h" #include "ObjectDefines.h" #include "GridDefines.h" diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index fe6db0bf6d1..a9e0e03ebae 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -16,7 +16,6 @@ */ #include "DatabaseEnv.h" -#include "SQLStorage.h" #include "ObjectMgr.h" #include "ObjectDefines.h" #include "GridDefines.h" diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index 7e715cc5f38..a5f580e5bca 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -23,7 +23,6 @@ #include "WorldPacket.h" #include "WorldSession.h" #include "DatabaseEnv.h" -#include "SQLStorage.h" #include "DBCStores.h" #include "ScriptMgr.h" #include "AccountMgr.h" diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 89578772417..f40fbc9f431 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -18,8 +18,6 @@ #include "Common.h" #include "DatabaseEnv.h" -#include "SQLStorage.h" -#include "SQLStorageImpl.h" #include "Log.h" #include "MapManager.h" #include "ObjectMgr.h" @@ -534,15 +532,6 @@ void ObjectMgr::LoadPointOfInterestLocales() sLog->outString(); } -struct SQLCreatureLoader : public SQLStorageLoaderBase -{ - template - void convert_from_str(uint32 /*field_pos*/, char *src, D &dst) - { - dst = D(sObjectMgr->GetScriptId(src)); - } -}; - void ObjectMgr::LoadCreatureTemplates() { uint32 oldMSTime = getMSTime(); @@ -2275,15 +2264,6 @@ void ObjectMgr::LoadItemLocales() sLog->outString(); } -struct SQLItemLoader : public SQLStorageLoaderBase -{ - template - void convert_from_str(uint32 /*field_pos*/, char *src, D &dst) - { - dst = D(sObjectMgr->GetScriptId(src)); - } -}; - void ObjectMgr::LoadItemTemplates() { uint32 oldMSTime = getMSTime(); @@ -5856,15 +5836,6 @@ void ObjectMgr::LoadPageTextLocales() sLog->outString(); } -struct SQLInstanceLoader : public SQLStorageLoaderBase -{ - template - void convert_from_str(uint32 /*field_pos*/, char *src, D &dst) - { - dst = D(sObjectMgr->GetScriptId(src)); - } -}; - void ObjectMgr::LoadInstanceTemplate() { uint32 oldMSTime = getMSTime(); @@ -7167,15 +7138,6 @@ void ObjectMgr::LoadGameObjectLocales() sLog->outString(); } -struct SQLGameObjectLoader : public SQLStorageLoaderBase -{ - template - void convert_from_str(uint32 /*field_pos*/, char *src, D &dst) - { - dst = D(sObjectMgr->GetScriptId(src)); - } -}; - inline void CheckGOLockId(GameObjectTemplate* goInfo,uint32 dataN,uint32 N) { if (sLockStore.LookupEntry(dataN)) diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index f4619fe7dbb..c9f3e8eb11e 100755 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -36,7 +36,6 @@ #include "ObjectAccessor.h" #include "ObjectDefines.h" #include -#include "SQLStorage.h" #include "Vehicle.h" #include #include diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index bf713b309ab..ddd27b273b0 100755 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -17,7 +17,6 @@ */ #include "Common.h" -#include "SQLStorage.h" #include "Player.h" #include "GridNotifiers.h" #include "Log.h" diff --git a/src/server/game/PrecompiledHeaders/gamePCH.h b/src/server/game/PrecompiledHeaders/gamePCH.h index cb67b1b8de6..68f628430c4 100644 --- a/src/server/game/PrecompiledHeaders/gamePCH.h +++ b/src/server/game/PrecompiledHeaders/gamePCH.h @@ -8,7 +8,6 @@ #include "Log.h" #include "ObjectAccessor.h" #include "ObjectDefines.h" -#include "SQLStorage.h" #include "Opcodes.h" #include "SharedDefines.h" #include "ObjectMgr.h" diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index 39594384542..51361c99700 100755 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -27,7 +27,6 @@ #include "SpellAuraDefines.h" #include "DBCStructure.h" #include "DBCStores.h" -#include "SQLStorage.h" #include "UnorderedMap.h" diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index 079789befaa..daf68906249 100755 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -17,7 +17,6 @@ #include "Common.h" #include "DatabaseEnv.h" -#include "SQLStorage.h" #include "CreatureTextMgr.h" #include "ObjectMgr.h" diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp index 1789c713a89..7b1d0882ee9 100755 --- a/src/server/game/Tickets/TicketMgr.cpp +++ b/src/server/game/Tickets/TicketMgr.cpp @@ -19,8 +19,6 @@ #include "Common.h" #include "TicketMgr.h" #include "DatabaseEnv.h" -#include "SQLStorage.h" -#include "SQLStorageImpl.h" #include "Log.h" #include "WorldPacket.h" #include "WorldSession.h" diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp index a8eb0478195..9bb844a3ed3 100755 --- a/src/server/game/Tools/PlayerDump.cpp +++ b/src/server/game/Tools/PlayerDump.cpp @@ -19,7 +19,6 @@ #include "Common.h" #include "PlayerDump.h" #include "DatabaseEnv.h" -#include "SQLStorage.h" #include "UpdateFields.h" #include "ObjectMgr.h" #include "AccountMgr.h" -- cgit v1.2.3