diff --git a/src/game/Object/ObjectMgr.cpp b/src/game/Object/ObjectMgr.cpp index 6cb11d39..6cf873ed 100644 --- a/src/game/Object/ObjectMgr.cpp +++ b/src/game/Object/ObjectMgr.cpp @@ -2974,7 +2974,6 @@ CreatureDataAddon const* ObjectMgr::GetCreatureAddon(uint32 lowguid) { return sC CreatureDataAddon const* ObjectMgr::GetCreatureTemplateAddon(uint32 entry) { return sCreatureInfoAddonStorage.LookupEntry(entry); } ItemPrototype const* ObjectMgr::GetItemPrototype(uint32 id) { return sItemStorage.LookupEntry(id); } InstanceTemplate const* ObjectMgr::GetInstanceTemplate(uint32 map) { return sInstanceTemplate.LookupEntry(map); } -WorldTemplate const* ObjectMgr::GetWorldTemplate(uint32 map) { return sWorldTemplate.LookupEntry(map); } /* ********************************************************************************************* */ /* * Loading Functions */ @@ -4303,37 +4302,6 @@ struct SQLWorldLoader : public SQLStorageLoaderBase } }; -void ObjectMgr::LoadWorldTemplate() -{ - SQLWorldLoader loader; - loader.Load(sWorldTemplate, false); - - for (uint32 i = 0; i < sWorldTemplate.GetMaxEntry(); ++i) - { - WorldTemplate const* temp = GetWorldTemplate(i); - if (!temp) - { continue; } - - MapEntry const* mapEntry = sMapStore.LookupEntry(temp->map); - if (!mapEntry) - { - sLog.outErrorDb("ObjectMgr::LoadWorldTemplate: bad mapid %d for template!", temp->map); - sWorldTemplate.EraseEntry(i); - continue; - } - - if (mapEntry->Instanceable()) - { - sLog.outErrorDb("ObjectMgr::LoadWorldTemplate: instanceable mapid %d for template!", temp->map); - sWorldTemplate.EraseEntry(i); - continue; - } - } - - sLog.outString(">> Loaded %u World Template definitions", sWorldTemplate.GetRecordCount()); - sLog.outString(); -} - void ObjectMgr::LoadConditions() { SQLWorldLoader loader; diff --git a/src/game/Object/ObjectMgr.h b/src/game/Object/ObjectMgr.h index 7ab37d5d..5d3a9a69 100644 --- a/src/game/Object/ObjectMgr.h +++ b/src/game/Object/ObjectMgr.h @@ -628,7 +628,6 @@ class ObjectMgr static CreatureDataAddon const* GetCreatureTemplateAddon(uint32 entry); ///< Wrapper for sCreatureInfoAddonStorage.LookupEntry static ItemPrototype const* GetItemPrototype(uint32 id); ///< Wrapper for sItemStorage.LookupEntry static InstanceTemplate const* GetInstanceTemplate(uint32 map); ///< Wrapper for sInstanceTemplate.LookupEntry - static WorldTemplate const* GetWorldTemplate(uint32 map); ///< Wrapper for sWorldTemplate.LookupEntry void LoadGroups(); void LoadQuests(); @@ -669,7 +668,6 @@ class ObjectMgr void LoadGossipMenuItemsLocales(); void LoadPointOfInterestLocales(); void LoadInstanceTemplate(); - void LoadWorldTemplate(); void LoadConditions(); void LoadGossipText(); diff --git a/src/game/Server/SQLStorages.cpp b/src/game/Server/SQLStorages.cpp index ad977fa2..3fbd250d 100644 --- a/src/game/Server/SQLStorages.cpp +++ b/src/game/Server/SQLStorages.cpp @@ -39,8 +39,6 @@ const char ItemPrototypedstfmt[] = "iiisiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii const char PageTextfmt[] = "isi"; const char InstanceTemplatesrcfmt[] = "iiiiiiiff"; const char InstanceTemplatedstfmt[] = "iiiiiiiff"; -const char WorldTemplatesrcfmt[] = "is"; -const char WorldTemplatedstfmt[] = "ii"; const char ConditionsSrcFmt[] = "iiii"; const char ConditionsDstFmt[] = "iiii"; const char CreatureTemplateSpellsFmt[] = "iiiii"; @@ -56,7 +54,6 @@ SQLStorage sEquipmentStorageRaw(EquipmentInfoRawfmt, "entry", "creature_equip_te SQLStorage sItemStorage(ItemPrototypesrcfmt, ItemPrototypedstfmt, "entry", "item_template"); SQLStorage sPageTextStore(PageTextfmt, "entry", "page_text"); SQLStorage sInstanceTemplate(InstanceTemplatesrcfmt, InstanceTemplatedstfmt, "map", "instance_template"); -SQLStorage sWorldTemplate(WorldTemplatesrcfmt, WorldTemplatedstfmt, "map", "world_template"); SQLStorage sConditionStorage(ConditionsSrcFmt, ConditionsDstFmt, "condition_entry", "conditions"); SQLHashStorage sGOStorage(GameObjectInfosrcfmt, GameObjectInfodstfmt, "entry", "gameobject_template"); diff --git a/src/game/Server/SQLStorages.h b/src/game/Server/SQLStorages.h index 0ba160af..7802ac9d 100644 --- a/src/game/Server/SQLStorages.h +++ b/src/game/Server/SQLStorages.h @@ -38,7 +38,6 @@ extern SQLStorage sEquipmentStorageRaw; extern SQLStorage sPageTextStore; extern SQLStorage sItemStorage; extern SQLStorage sInstanceTemplate; -extern SQLStorage sWorldTemplate; extern SQLStorage sConditionStorage; extern SQLHashStorage sGOStorage; diff --git a/src/game/WorldHandlers/Map.h b/src/game/WorldHandlers/Map.h index 80dea4e0..c7f602cd 100644 --- a/src/game/WorldHandlers/Map.h +++ b/src/game/WorldHandlers/Map.h @@ -86,12 +86,6 @@ struct InstanceTemplate uint32 script_id; }; -struct WorldTemplate -{ - uint32 map; // non-instance map - uint32 script_id; -}; - #if defined( __GNUC__ ) #pragma pack() #else