diff options
| author | megamage <none@none> | 2009-05-24 12:16:12 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-05-24 12:16:12 -0500 |
| commit | 09b386a78621d177b28df24ca9e13ee25e6d042b (patch) | |
| tree | d7e68d961d693034b0dfd4ecb027194cdc824d61 /src/game/ObjectMgr.h | |
| parent | aa67033cc71c536f4d0f4c1cf6d6444d48103371 (diff) | |
[7886] Drop use table `petcreateinfo_spell`
This is first commit in chain for remove oudated and not used pet functionality.
* Use instead dropped table CreatureSpellData.dbc if creature_template.PetSpellDataId set (mostly hunter pets)
* Use creature_template.spellN if not set creature_template.PetSpellDataId (mostly different summon creatures)
* Fixed bug with not removing from action bar spell icon for not ranked unlearned spells.
Note: summoned controllable creatures without PetSpellDataId must have expected spells in spellN feilds for creature_template.
[7887] Drop pet spell teaching code, including field in character_pet.
Author: VladimirMangos
--HG--
branch : trunk
Diffstat (limited to 'src/game/ObjectMgr.h')
| -rw-r--r-- | src/game/ObjectMgr.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index 000e95623f4..ca4093f875a 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -195,11 +195,6 @@ struct PointOfInterest std::string icon_name; }; -struct PetCreateSpellEntry -{ - uint32 spellid[4]; -}; - #define WEATHER_SEASONS 4 struct WeatherSeasonChances { @@ -339,8 +334,6 @@ class ObjectMgr typedef UNORDERED_MAP<uint32, WeatherZoneChances> WeatherZoneMap; - typedef UNORDERED_MAP<uint32, PetCreateSpellEntry> PetCreateSpellMap; - typedef std::vector<std::string> ScriptNameMap; UNORDERED_MAP<uint32, uint32> TransportEventMap; @@ -494,14 +487,6 @@ class ObjectMgr return NULL; } - PetCreateSpellEntry const* GetPetCreateSpellEntry(uint32 id) const - { - PetCreateSpellMap::const_iterator itr = mPetCreateSpell.find(id); - if(itr != mPetCreateSpell.end()) - return &itr->second; - return NULL; - } - void LoadGuilds(); void LoadArenaTeams(); void LoadGroups(); @@ -534,8 +519,7 @@ class ObjectMgr bool LoadTrinityStrings(DatabaseType& db, char const* table, int32 min_value, int32 max_value); bool LoadTrinityStrings() { return LoadTrinityStrings(WorldDatabase,"trinity_string",MIN_TRINITY_STRING_ID,MAX_TRINITY_STRING_ID); } - void LoadDbScriptStrings(); - void LoadPetCreateSpells(); + void LoadDbScriptStrings(); void LoadCreatureLocales(); void LoadCreatureTemplates(); void LoadCreatures(); @@ -867,8 +851,6 @@ class ObjectMgr WeatherZoneMap mWeatherZoneMap; - PetCreateSpellMap mPetCreateSpell; - //character reserved names typedef std::set<std::wstring> ReservedNamesMap; ReservedNamesMap m_ReservedNames; |
