Apply style fix pt2

This commit is contained in:
Antz 2020-01-12 00:21:01 +00:00
parent 35405dd549
commit 1392c131e7
77 changed files with 1318 additions and 817 deletions

View file

@ -617,10 +617,19 @@ class ObjectMgr
PlayerInfo const* GetPlayerInfo(uint32 race, uint32 class_) const
{
if (race >= MAX_RACES) { return NULL; }
if (class_ >= MAX_CLASSES) { return NULL; }
if (race >= MAX_RACES)
{
return NULL;
}
if (class_ >= MAX_CLASSES)
{
return NULL;
}
PlayerInfo const* info = &playerInfo[race][class_];
if (info->displayId_m == 0 || info->displayId_f == 0) { return NULL; }
if (info->displayId_m == 0 || info->displayId_f == 0)
{
return NULL;
}
return info;
}
void GetPlayerLevelInfo(uint32 race, uint32 class_, uint32 level, PlayerLevelInfo* info) const;
@ -963,7 +972,10 @@ class ObjectMgr
CreatureDataPair const* GetCreatureDataPair(uint32 guid) const
{
CreatureDataMap::const_iterator itr = mCreatureDataMap.find(guid);
if (itr == mCreatureDataMap.end()) { return NULL; }
if (itr == mCreatureDataMap.end())
{
return NULL;
}
return &*itr;
}
@ -992,7 +1004,10 @@ class ObjectMgr
CreatureLocale const* GetCreatureLocale(uint32 entry) const
{
CreatureLocaleMap::const_iterator itr = mCreatureLocaleMap.find(entry);
if (itr == mCreatureLocaleMap.end()) { return NULL; }
if (itr == mCreatureLocaleMap.end())
{
return NULL;
}
return &itr->second;
}
@ -1001,14 +1016,20 @@ class ObjectMgr
GameObjectLocale const* GetGameObjectLocale(uint32 entry) const
{
GameObjectLocaleMap::const_iterator itr = mGameObjectLocaleMap.find(entry);
if (itr == mGameObjectLocaleMap.end()) { return NULL; }
if (itr == mGameObjectLocaleMap.end())
{
return NULL;
}
return &itr->second;
}
ItemLocale const* GetItemLocale(uint32 entry) const
{
ItemLocaleMap::const_iterator itr = mItemLocaleMap.find(entry);
if (itr == mItemLocaleMap.end()) { return NULL; }
if (itr == mItemLocaleMap.end())
{
return NULL;
}
return &itr->second;
}
@ -1017,7 +1038,10 @@ class ObjectMgr
QuestLocale const* GetQuestLocale(uint32 entry) const
{
QuestLocaleMap::const_iterator itr = mQuestLocaleMap.find(entry);
if (itr == mQuestLocaleMap.end()) { return NULL; }
if (itr == mQuestLocaleMap.end())
{
return NULL;
}
return &itr->second;
}
@ -1026,7 +1050,10 @@ class ObjectMgr
NpcTextLocale const* GetNpcTextLocale(uint32 entry) const
{
NpcTextLocaleMap::const_iterator itr = mNpcTextLocaleMap.find(entry);
if (itr == mNpcTextLocaleMap.end()) { return NULL; }
if (itr == mNpcTextLocaleMap.end())
{
return NULL;
}
return &itr->second;
}
@ -1037,28 +1064,40 @@ class ObjectMgr
PageTextLocale const* GetPageTextLocale(uint32 entry) const
{
PageTextLocaleMap::const_iterator itr = mPageTextLocaleMap.find(entry);
if (itr == mPageTextLocaleMap.end()) { return NULL; }
if (itr == mPageTextLocaleMap.end())
{
return NULL;
}
return &itr->second;
}
GossipMenuItemsLocale const* GetGossipMenuItemsLocale(uint32 entry) const
{
GossipMenuItemsLocaleMap::const_iterator itr = mGossipMenuItemsLocaleMap.find(entry);
if (itr == mGossipMenuItemsLocaleMap.end()) { return NULL; }
if (itr == mGossipMenuItemsLocaleMap.end())
{
return NULL;
}
return &itr->second;
}
PointOfInterestLocale const* GetPointOfInterestLocale(uint32 poi_id) const
{
PointOfInterestLocaleMap::const_iterator itr = mPointOfInterestLocaleMap.find(poi_id);
if (itr == mPointOfInterestLocaleMap.end()) { return NULL; }
if (itr == mPointOfInterestLocaleMap.end())
{
return NULL;
}
return &itr->second;
}
GameObjectDataPair const* GetGODataPair(uint32 guid) const
{
GameObjectDataMap::const_iterator itr = mGameObjectDataMap.find(guid);
if (itr == mGameObjectDataMap.end()) { return NULL; }
if (itr == mGameObjectDataMap.end())
{
return NULL;
}
return &*itr;
}
@ -1087,7 +1126,10 @@ class ObjectMgr
MangosStringLocale const* GetMangosStringLocale(int32 entry) const
{
MangosStringLocaleMap::const_iterator itr = mMangosStringLocaleMap.find(entry);
if (itr == mMangosStringLocaleMap.end()) { return NULL; }
if (itr == mMangosStringLocaleMap.end())
{
return NULL;
}
return &itr->second;
}
uint32 GetLoadedStringsCount(int32 minEntry) const
@ -1142,7 +1184,10 @@ class ObjectMgr
GameTele const* GetGameTele(uint32 id) const
{
GameTeleMap::const_iterator itr = m_GameTeleMap.find(id);
if (itr == m_GameTeleMap.end()) { return NULL; }
if (itr == m_GameTeleMap.end())
{
return NULL;
}
return &itr->second;
}