josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Cosmetic] Apply codestyle "XXX * " and "XXX *" changed to "XXX* " (with some exceptions)

Browse Source
This commit is contained in:
Spp
2011-09-15 14:12:57 +02:00
parent 9006e4e8dc
commit af05915b9e
431 changed files with 3131 additions and 3131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Globals/ObjectAccessor.h
+2 -2
View File
@@ -140,7 +140,7 @@ class ObjectAccessor
}
// returns object if is in map
template<class T> static T* GetObjectInMap(uint64 guid, Map * map, T* /*typeSpecifier*/)
template<class T> static T* GetObjectInMap(uint64 guid, Map* map, T* /*typeSpecifier*/)
{
ASSERT(map);
if (T * obj = GetObjectInWorld(guid, (T*)NULL))
@@ -192,7 +192,7 @@ class ObjectAccessor
// these functions return objects if found in whole world
// ACCESS LIKE THAT IS NOT THREAD SAFE
static Pet * FindPet(uint64);
static Pet* FindPet(uint64);
static Player* FindPlayer(uint64);
static Unit* FindUnit(uint64);
Player* FindPlayerByName(const char* name);
src/server/game/Globals/ObjectMgr.cpp
+99 -99
View File
@@ -303,7 +303,7 @@ void ObjectMgr::LoadCreatureLocales()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 entry = fields[0].GetUInt32();
@@ -339,7 +339,7 @@ void ObjectMgr::LoadGossipMenuItemsLocales()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint16 menuId = fields[0].GetUInt16();
uint16 id = fields[1].GetUInt16();
@@ -371,7 +371,7 @@ void ObjectMgr::LoadPointOfInterestLocales()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 entry = fields[0].GetUInt32();
@@ -417,7 +417,7 @@ void ObjectMgr::LoadCreatureTemplates()
uint32 count = 0;
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 entry = fields[0].GetUInt32();
@@ -543,7 +543,7 @@ void ObjectMgr::LoadCreatureTemplateAddons()
uint32 count = 0;
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 entry = fields[0].GetUInt32();
@@ -566,7 +566,7 @@ void ObjectMgr::LoadCreatureTemplateAddons()
creatureAddon.auras.resize(tokens.size());
for (Tokens::iterator itr = tokens.begin(); itr != tokens.end(); ++itr)
{
SpellInfo const *AdditionalSpellInfo = sSpellMgr->GetSpellInfo(uint32(atol(*itr)));
SpellInfo const* AdditionalSpellInfo = sSpellMgr->GetSpellInfo(uint32(atol(*itr)));
if (!AdditionalSpellInfo)
{
sLog->outErrorDb("Creature (GUID: %u) has wrong spell %u defined in `auras` field in `creature_addon`.", entry, uint32(atol(*itr)));
@@ -911,7 +911,7 @@ void ObjectMgr::LoadCreatureAddons()
uint32 count = 0;
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 guid = fields[0].GetUInt32();
@@ -934,7 +934,7 @@ void ObjectMgr::LoadCreatureAddons()
creatureAddon.auras.resize(tokens.size());
for (Tokens::iterator itr = tokens.begin(); itr != tokens.end(); ++itr)
{
SpellInfo const *AdditionalSpellInfo = sSpellMgr->GetSpellInfo(uint32(atol(*itr)));
SpellInfo const* AdditionalSpellInfo = sSpellMgr->GetSpellInfo(uint32(atol(*itr)));
if (!AdditionalSpellInfo)
{
sLog->outErrorDb("Creature (GUID: %u) has wrong spell %u defined in `auras` field in `creature_addon`.", guid, uint32(atol(*itr)));
@@ -1021,7 +1021,7 @@ void ObjectMgr::LoadEquipmentTemplates()
if (!equipmentInfo.ItemEntry[i])
continue;
ItemEntry const *dbcItem = sItemStore.LookupEntry(equipmentInfo.ItemEntry[i]);
ItemEntry const* dbcItem = sItemStore.LookupEntry(equipmentInfo.ItemEntry[i]);
if (!dbcItem)
{
@@ -1064,7 +1064,7 @@ CreatureModelInfo const* ObjectMgr::GetCreatureModelInfo(uint32 modelId)
return NULL;
}
uint32 ObjectMgr::ChooseDisplayId(uint32 /*team*/, const CreatureTemplate *cinfo, const CreatureData *data /*= NULL*/)
uint32 ObjectMgr::ChooseDisplayId(uint32 /*team*/, const CreatureTemplate* cinfo, const CreatureData* data /*= NULL*/)
{
// Load creature model (display id)
uint32 display_id = 0;
@@ -1079,7 +1079,7 @@ uint32 ObjectMgr::ChooseDisplayId(uint32 /*team*/, const CreatureTemplate *cinfo
return display_id;
}
void ObjectMgr::ChooseCreatureFlags(const CreatureTemplate *cinfo, uint32& npcflag, uint32& unit_flags, uint32& dynamicflags, const CreatureData *data /*= NULL*/)
void ObjectMgr::ChooseCreatureFlags(const CreatureTemplate* cinfo, uint32& npcflag, uint32& unit_flags, uint32& dynamicflags, const CreatureData* data /*= NULL*/)
{
npcflag = cinfo->npcflag;
unit_flags = cinfo->unit_flags;
@@ -1107,7 +1107,7 @@ CreatureModelInfo const* ObjectMgr::GetCreatureModelRandomGender(uint32* display
// If a model for another gender exists, 50% chance to use it
if (minfo->modelid_other_gender != 0 && urand(0, 1) == 0)
{
CreatureModelInfo const *minfo_tmp = GetCreatureModelInfo(minfo->modelid_other_gender);
CreatureModelInfo const* minfo_tmp = GetCreatureModelInfo(minfo->modelid_other_gender);
if (!minfo_tmp)
sLog->outErrorDb("Model (Entry: %u) has modelid_other_gender %u not found in table `creature_model_info`. ", *displayID, minfo->modelid_other_gender);
else
@@ -1138,7 +1138,7 @@ void ObjectMgr::LoadCreatureModelInfo()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 modelId = fields[0].GetUInt32();
@@ -1195,7 +1195,7 @@ void ObjectMgr::LoadLinkedRespawn()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 guidLow = fields[0].GetUInt32();
uint32 linkedGuidLow = fields[1].GetUInt32();
@@ -1446,7 +1446,7 @@ void ObjectMgr::LoadCreatures()
uint32 count = 0;
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 guid = fields[ 0].GetUInt32();
uint32 entry = fields[ 1].GetUInt32();
@@ -1629,7 +1629,7 @@ uint32 ObjectMgr::AddGOData(uint32 entry, uint32 mapId, float x, float y, float
// We use spawn coords to spawn
if (!map->Instanceable() && map->IsLoaded(x, y))
{
GameObject *go = new GameObject;
GameObject* go = new GameObject;
if (!go->LoadFromDB(guid, map))
{
sLog->outError("AddGOData: cannot add gameobject entry %u to map", entry);
@@ -1665,7 +1665,7 @@ bool ObjectMgr::MoveCreData(uint32 guid, uint32 mapId, Position pos)
// We use spawn coords to spawn
if (!map->Instanceable() && map->IsLoaded(data.posX, data.posY))
{
Creature *creature = new Creature;
Creature* creature = new Creature;
if (!creature->LoadFromDB(guid, map))
{
sLog->outError("AddCreature: cannot add creature entry %u to map", guid);
@@ -1680,7 +1680,7 @@ bool ObjectMgr::MoveCreData(uint32 guid, uint32 mapId, Position pos)
uint32 ObjectMgr::AddCreData(uint32 entry, uint32 /*team*/, uint32 mapId, float x, float y, float z, float o, uint32 spawntimedelay)
{
CreatureTemplate const *cInfo = GetCreatureTemplate(entry);
CreatureTemplate const* cInfo = GetCreatureTemplate(entry);
if (!cInfo)
return 0;
@@ -1762,7 +1762,7 @@ void ObjectMgr::LoadGameobjects()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 guid = fields[ 0].GetUInt32();
uint32 entry = fields[ 1].GetUInt32();
@@ -1921,7 +1921,7 @@ void ObjectMgr::LoadCreatureRespawnTimes()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 loguid = fields[0].GetUInt32();
uint32 respawn_time = fields[1].GetUInt32();
@@ -1955,7 +1955,7 @@ void ObjectMgr::LoadGameobjectRespawnTimes()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 loguid = fields[0].GetUInt32();
uint32 respawn_time = fields[1].GetUInt32();
@@ -2073,7 +2073,7 @@ void ObjectMgr::LoadItemLocales()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 entry = fields[0].GetUInt32();
@@ -2140,7 +2140,7 @@ void ObjectMgr::LoadItemTemplates()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 entry = fields[0].GetUInt32();
@@ -2253,7 +2253,7 @@ void ObjectMgr::LoadItemTemplates()
// Checks
ItemEntry const *dbcitem = sItemStore.LookupEntry(entry);
ItemEntry const* dbcitem = sItemStore.LookupEntry(entry);
if (dbcitem)
{
@@ -2710,7 +2710,7 @@ void ObjectMgr::LoadItemSetNameLocales()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 entry = fields[0].GetUInt32();
@@ -2757,7 +2757,7 @@ void ObjectMgr::LoadItemSetNames()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 entry = fields[0].GetUInt32();
if (itemSetItems.find(entry) == itemSetItems.end())
@@ -2825,7 +2825,7 @@ void ObjectMgr::LoadVehicleTemplateAccessories()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 uiEntry = fields[0].GetUInt32();
uint32 uiAccessory = fields[1].GetUInt32();
@@ -2881,7 +2881,7 @@ void ObjectMgr::LoadVehicleAccessories()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 uiGUID = fields[0].GetUInt32();
uint32 uiAccessory = fields[1].GetUInt32();
@@ -3740,7 +3740,7 @@ void ObjectMgr::LoadQuests()
// for example set of race quests can lead to single not race specific quest
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
Quest * newQuest = new Quest(fields);
mQuestTemplates[newQuest->GetQuestId()] = newQuest;
@@ -4343,7 +4343,7 @@ void ObjectMgr::LoadQuests()
// check QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT for spell with SPELL_EFFECT_QUEST_COMPLETE
for (uint32 i = 0; i < sSpellMgr->GetSpellInfoStoreSize(); ++i)
{
SpellInfo const *spellInfo = sSpellMgr->GetSpellInfo(i);
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(i);
if (!spellInfo)
continue;
@@ -4396,7 +4396,7 @@ void ObjectMgr::LoadQuestLocales()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 entry = fields[0].GetUInt32();
@@ -4427,7 +4427,7 @@ void ObjectMgr::LoadScripts(ScriptsType type)
{
uint32 oldMSTime = getMSTime();
ScriptMapMap *scripts = GetScriptsMapByType(type);
ScriptMapMap* scripts = GetScriptsMapByType(type);
if (!scripts)
return;
@@ -4459,7 +4459,7 @@ void ObjectMgr::LoadScripts(ScriptsType type)
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
ScriptInfo tmp;
tmp.type = type;
tmp.id = fields[0].GetUInt32();
@@ -4863,7 +4863,7 @@ void ObjectMgr::LoadWaypointScripts()
{
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 action = fields[0].GetUInt32();
actionSet.erase(action);
@@ -4895,7 +4895,7 @@ void ObjectMgr::LoadSpellScriptNames()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
int32 spellId = fields[0].GetInt32();
const char *scriptName = fields[1].GetCString();
@@ -4959,8 +4959,8 @@ void ObjectMgr::ValidateSpellScripts()
for (std::vector<std::pair<SpellScriptLoader *, SpellScriptsMap::iterator> >::iterator sitr = SpellScriptLoaders.begin(); sitr != SpellScriptLoaders.end(); ++sitr)
{
SpellScript * spellScript = sitr->first->GetSpellScript();
AuraScript * auraScript = sitr->first->GetAuraScript();
SpellScript* spellScript = sitr->first->GetSpellScript();
AuraScript* auraScript = sitr->first->GetAuraScript();
bool valid = true;
if (!spellScript && !auraScript)
{
@@ -5059,7 +5059,7 @@ void ObjectMgr::LoadPageTextLocales()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 entry = fields[0].GetUInt32();
@@ -5204,7 +5204,7 @@ void ObjectMgr::LoadInstanceEncounters()
sLog->outString();
}
GossipText const *ObjectMgr::GetGossipText(uint32 Text_ID) const
GossipText const* ObjectMgr::GetGossipText(uint32 Text_ID) const
{
GossipTextMap::const_iterator itr = mGossipText.find(Text_ID);
if (itr != mGossipText.end())
@@ -5234,7 +5234,7 @@ void ObjectMgr::LoadGossipText()
++count;
cic = 0;
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 Text_ID = fields[cic++].GetUInt32();
if (!Text_ID)
@@ -5287,7 +5287,7 @@ void ObjectMgr::LoadNpcTextLocales()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 entry = fields[0].GetUInt32();
@@ -5356,8 +5356,8 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp)
do
{
Field *fields = result->Fetch();
Mail *m = new Mail;
Field* fields = result->Fetch();
Mail* m = new Mail;
m->messageID = fields[0].GetUInt32();
m->messageType = fields[1].GetUInt8();
m->sender = fields[2].GetUInt32();
@@ -5369,7 +5369,7 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp)
m->checked = fields[7].GetUInt32();
m->mailTemplateId = fields[8].GetInt16();
Player *pl = NULL;
Player* pl = NULL;
if (serverUp)
pl = ObjectAccessor::FindPlayer((uint64)m->receiver);
@@ -5460,7 +5460,7 @@ void ObjectMgr::LoadQuestAreaTriggers()
{
++count;
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 trigger_ID = fields[0].GetUInt32();
uint32 quest_ID = fields[1].GetUInt32();
@@ -5519,7 +5519,7 @@ void ObjectMgr::LoadTavernAreaTriggers()
{
++count;
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 Trigger_ID = fields[0].GetUInt32();
@@ -5557,7 +5557,7 @@ void ObjectMgr::LoadAreaTriggerScripts()
{
++count;
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 Trigger_ID = fields[0].GetUInt32();
const char *scriptName = fields[1].GetCString();
@@ -5661,7 +5661,7 @@ uint32 ObjectMgr::GetTaxiMountDisplayId(uint32 id, uint32 team, bool allowed_alt
mount_entry = team == ALLIANCE ? node->MountCreatureID[0] : node->MountCreatureID[1];
}
CreatureTemplate const *mount_info = GetCreatureTemplate(mount_entry);
CreatureTemplate const* mount_info = GetCreatureTemplate(mount_entry);
if (mount_info)
{
mount_id = mount_info->GetRandomValidModelId();
@@ -5700,7 +5700,7 @@ void ObjectMgr::LoadGraveyardZones()
{
++count;
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 safeLocId = fields[0].GetUInt32();
uint32 zoneId = fields[1].GetUInt32();
@@ -5713,7 +5713,7 @@ void ObjectMgr::LoadGraveyardZones()
continue;
}
AreaTableEntry const *areaEntry = GetAreaEntryByAreaID(zoneId);
AreaTableEntry const* areaEntry = GetAreaEntryByAreaID(zoneId);
if (!areaEntry)
{
sLog->outErrorDb("Table `game_graveyard_zone` has a record for not existing zone id (%u), skipped.", zoneId);
@@ -5740,7 +5740,7 @@ void ObjectMgr::LoadGraveyardZones()
sLog->outString();
}
WorldSafeLocsEntry const *ObjectMgr::GetDefaultGraveYard(uint32 team)
WorldSafeLocsEntry const* ObjectMgr::GetDefaultGraveYard(uint32 team)
{
enum DefaultGraveyard
{
@@ -5755,7 +5755,7 @@ WorldSafeLocsEntry const *ObjectMgr::GetDefaultGraveYard(uint32 team)
else return NULL;
}
WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float z, uint32 MapId, uint32 team)
WorldSafeLocsEntry const* ObjectMgr::GetClosestGraveYard(float x, float y, float z, uint32 MapId, uint32 team)
{
// search for zone associated closest graveyard
uint32 zoneId = sMapMgr->GetZoneId(MapId, x, y, z);
@@ -5982,7 +5982,7 @@ void ObjectMgr::LoadAreaTriggerTeleports()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
++count;
@@ -6043,7 +6043,7 @@ void ObjectMgr::LoadAccessRequirements()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
++count;
@@ -6064,7 +6064,7 @@ void ObjectMgr::LoadAccessRequirements()
if (ar.item)
{
ItemTemplate const *pProto = sObjectMgr->GetItemTemplate(ar.item);
ItemTemplate const* pProto = sObjectMgr->GetItemTemplate(ar.item);
if (!pProto)
{
sLog->outError("Key item %u does not exist for map %u difficulty %u, removing key requirement.", ar.item, mapid, difficulty);
@@ -6074,7 +6074,7 @@ void ObjectMgr::LoadAccessRequirements()
if (ar.item2)
{
ItemTemplate const *pProto = sObjectMgr->GetItemTemplate(ar.item2);
ItemTemplate const* pProto = sObjectMgr->GetItemTemplate(ar.item2);
if (!pProto)
{
sLog->outError("Second item %u does not exist for map %u difficulty %u, removing key requirement.", ar.item2, mapid, difficulty);
@@ -6123,13 +6123,13 @@ AreaTrigger const* ObjectMgr::GetGoBackTrigger(uint32 Map) const
{
bool useParentDbValue = false;
uint32 parentId = 0;
const MapEntry *mapEntry = sMapStore.LookupEntry(Map);
const MapEntry* mapEntry = sMapStore.LookupEntry(Map);
if (!mapEntry || mapEntry->entrance_map < 0)
return NULL;
if (mapEntry->IsDungeon())
{
const InstanceTemplate *iTemplate = sObjectMgr->GetInstanceTemplate(Map);
const InstanceTemplate* iTemplate = sObjectMgr->GetInstanceTemplate(Map);
if (!iTemplate)
return NULL;
@@ -6344,7 +6344,7 @@ void ObjectMgr::LoadGameObjectLocales()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 entry = fields[0].GetUInt32();
@@ -6442,7 +6442,7 @@ void ObjectMgr::LoadGameObjectTemplate()
uint32 count = 0;
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 entry = fields[0].GetUInt32();
@@ -6629,7 +6629,7 @@ void ObjectMgr::LoadExplorationBaseXP()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint8 level = fields[0].GetUInt8();
uint32 basexp = fields[1].GetUInt32();
mBaseXPTable[level] = basexp;
@@ -6671,7 +6671,7 @@ void ObjectMgr::LoadPetNames()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
std::string word = fields[0].GetString();
uint32 entry = fields[1].GetUInt32();
bool half = fields[2].GetBool();
@@ -6694,7 +6694,7 @@ void ObjectMgr::LoadPetNumber()
QueryResult result = CharacterDatabase.Query("SELECT MAX(id) FROM character_pet");
if (result)
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
m_hiPetNumber = fields[0].GetUInt32()+1;
}
@@ -6709,7 +6709,7 @@ std::string ObjectMgr::GeneratePetName(uint32 entry)
if (list0.empty() || list1.empty())
{
CreatureTemplate const *cinfo = GetCreatureTemplate(entry);
CreatureTemplate const* cinfo = GetCreatureTemplate(entry);
char* petname = GetPetName(cinfo->family, sWorld->GetDefaultDbcLocale());
if (!petname)
return cinfo->Name;
@@ -6740,10 +6740,10 @@ void ObjectMgr::LoadCorpses()
uint32 count = 0;
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 guid = fields[16].GetUInt32();
Corpse *corpse = new Corpse();
Corpse* corpse = new Corpse();
if (!corpse->LoadFromDB(guid, fields))
{
delete corpse;
@@ -6778,7 +6778,7 @@ void ObjectMgr::LoadReputationRewardRate()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 factionId = fields[0].GetUInt32();
@@ -6788,7 +6788,7 @@ void ObjectMgr::LoadReputationRewardRate()
repRate.creature_rate = fields[2].GetFloat();
repRate.spell_rate = fields[3].GetFloat();
FactionEntry const *factionEntry = sFactionStore.LookupEntry(factionId);
FactionEntry const* factionEntry = sFactionStore.LookupEntry(factionId);
if (!factionEntry)
{
sLog->outErrorDb("Faction (faction.dbc) %u does not exist but is used in `reputation_reward_rate`", factionId);
@@ -6847,7 +6847,7 @@ void ObjectMgr::LoadReputationOnKill()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 creature_id = fields[0].GetUInt32();
@@ -6870,7 +6870,7 @@ void ObjectMgr::LoadReputationOnKill()
if (repOnKill.repfaction1)
{
FactionEntry const *factionEntry1 = sFactionStore.LookupEntry(repOnKill.repfaction1);
FactionEntry const* factionEntry1 = sFactionStore.LookupEntry(repOnKill.repfaction1);
if (!factionEntry1)
{
sLog->outErrorDb("Faction (faction.dbc) %u does not exist but is used in `creature_onkill_reputation`", repOnKill.repfaction1);
@@ -6880,7 +6880,7 @@ void ObjectMgr::LoadReputationOnKill()
if (repOnKill.repfaction2)
{
FactionEntry const *factionEntry2 = sFactionStore.LookupEntry(repOnKill.repfaction2);
FactionEntry const* factionEntry2 = sFactionStore.LookupEntry(repOnKill.repfaction2);
if (!factionEntry2)
{
sLog->outErrorDb("Faction (faction.dbc) %u does not exist but is used in `creature_onkill_reputation`", repOnKill.repfaction2);
@@ -6916,7 +6916,7 @@ void ObjectMgr::LoadReputationSpilloverTemplate()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 factionId = fields[0].GetUInt32();
@@ -6935,7 +6935,7 @@ void ObjectMgr::LoadReputationSpilloverTemplate()
repTemplate.faction_rate[3] = fields[11].GetFloat();
repTemplate.faction_rank[3] = fields[12].GetUInt32();
FactionEntry const *factionEntry = sFactionStore.LookupEntry(factionId);
FactionEntry const* factionEntry = sFactionStore.LookupEntry(factionId);
if (!factionEntry)
{
@@ -6953,7 +6953,7 @@ void ObjectMgr::LoadReputationSpilloverTemplate()
{
if (repTemplate.faction[i])
{
FactionEntry const *factionSpillover = sFactionStore.LookupEntry(repTemplate.faction[i]);
FactionEntry const* factionSpillover = sFactionStore.LookupEntry(repTemplate.faction[i]);
if (!factionSpillover)
{
@@ -6975,25 +6975,25 @@ void ObjectMgr::LoadReputationSpilloverTemplate()
}
}
FactionEntry const *factionEntry0 = sFactionStore.LookupEntry(repTemplate.faction[0]);
FactionEntry const* factionEntry0 = sFactionStore.LookupEntry(repTemplate.faction[0]);
if (repTemplate.faction[0] && !factionEntry0)
{
sLog->outErrorDb("Faction (faction.dbc) %u does not exist but is used in `reputation_spillover_template`", repTemplate.faction[0]);
continue;
}
FactionEntry const *factionEntry1 = sFactionStore.LookupEntry(repTemplate.faction[1]);
FactionEntry const* factionEntry1 = sFactionStore.LookupEntry(repTemplate.faction[1]);
if (repTemplate.faction[1] && !factionEntry1)
{
sLog->outErrorDb("Faction (faction.dbc) %u does not exist but is used in `reputation_spillover_template`", repTemplate.faction[1]);
continue;
}
FactionEntry const *factionEntry2 = sFactionStore.LookupEntry(repTemplate.faction[2]);
FactionEntry const* factionEntry2 = sFactionStore.LookupEntry(repTemplate.faction[2]);
if (repTemplate.faction[2] && !factionEntry2)
{
sLog->outErrorDb("Faction (faction.dbc) %u does not exist but is used in `reputation_spillover_template`", repTemplate.faction[2]);
continue;
}
FactionEntry const *factionEntry3 = sFactionStore.LookupEntry(repTemplate.faction[3]);
FactionEntry const* factionEntry3 = sFactionStore.LookupEntry(repTemplate.faction[3]);
if (repTemplate.faction[3] && !factionEntry3)
{
sLog->outErrorDb("Faction (faction.dbc) %u does not exist but is used in `reputation_spillover_template`", repTemplate.faction[3]);
@@ -7030,7 +7030,7 @@ void ObjectMgr::LoadPointsOfInterest()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 point_id = fields[0].GetUInt32();
@@ -7083,14 +7083,14 @@ void ObjectMgr::LoadQuestPOI()
if (points)
{
// The first result should have the highest questId
Field *fields = points->Fetch();
Field* fields = points->Fetch();
uint32 questId = fields[0].GetUInt32();
POIs.resize(questId + 1);
do
{
Field *fields = points->Fetch();
Field* fields = points->Fetch();
uint32 questId = fields[0].GetUInt32();
uint32 id = fields[1].GetUInt32();
@@ -7107,7 +7107,7 @@ void ObjectMgr::LoadQuestPOI()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 questId = fields[0].GetUInt32();
uint32 id = fields[1].GetUInt32();
@@ -7149,7 +7149,7 @@ void ObjectMgr::LoadNPCSpellClickSpells()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 npc_entry = fields[0].GetUInt32();
CreatureTemplate const* cInfo = GetCreatureTemplate(npc_entry);
@@ -7160,7 +7160,7 @@ void ObjectMgr::LoadNPCSpellClickSpells()
}
uint32 spellid = fields[1].GetUInt32();
SpellInfo const *spellinfo = sSpellMgr->GetSpellInfo(spellid);
SpellInfo const* spellinfo = sSpellMgr->GetSpellInfo(spellid);
if (!spellinfo)
{
sLog->outErrorDb("Table npc_spellclick_spells references unknown spellid %u. Skipping entry.", spellid);
@@ -7170,7 +7170,7 @@ void ObjectMgr::LoadNPCSpellClickSpells()
uint32 auraRequired = fields[6].GetUInt32();
if (auraRequired)
{
SpellInfo const *aurReqInfo = sSpellMgr->GetSpellInfo(auraRequired);
SpellInfo const* aurReqInfo = sSpellMgr->GetSpellInfo(auraRequired);
if (!aurReqInfo)
{
sLog->outErrorDb("Table npc_spellclick_spells references unknown aura required %u. Skipping entry.", auraRequired);
@@ -7181,7 +7181,7 @@ void ObjectMgr::LoadNPCSpellClickSpells()
uint32 auraForbidden = fields[7].GetUInt32();
if (auraForbidden)
{
SpellInfo const *aurForInfo = sSpellMgr->GetSpellInfo(auraForbidden);
SpellInfo const* aurForInfo = sSpellMgr->GetSpellInfo(auraForbidden);
if (!aurForInfo)
{
sLog->outErrorDb("Table npc_spellclick_spells references unknown aura forbidden %u. Skipping entry.", auraForbidden);
@@ -7798,7 +7798,7 @@ bool ObjectMgr::LoadTrinityStrings(char const* table, int32 min_value, int32 max
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
int32 entry = fields[0].GetInt32();
@@ -7839,7 +7839,7 @@ bool ObjectMgr::LoadTrinityStrings(char const* table, int32 min_value, int32 max
const char *ObjectMgr::GetTrinityString(int32 entry, LocaleConstant locale_idx) const
{
if (TrinityStringLocale const *msl = GetTrinityStringLocale(entry))
if (TrinityStringLocale const* msl = GetTrinityStringLocale(entry))
{
if (msl->Content.size() > size_t(locale_idx) && !msl->Content[locale_idx].empty())
return msl->Content[locale_idx].c_str();
@@ -7874,7 +7874,7 @@ void ObjectMgr::LoadFishingBaseSkillLevel()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 entry = fields[0].GetUInt32();
int32 skill = fields[1].GetInt32();
@@ -7931,7 +7931,7 @@ SpellScriptsBounds ObjectMgr::GetSpellScriptsBounds(uint32 spell_id)
return SpellScriptsBounds(mSpellScripts.lower_bound(spell_id), mSpellScripts.upper_bound(spell_id));
}
SkillRangeType GetSkillRangeType(SkillLineEntry const *pSkill, bool racial)
SkillRangeType GetSkillRangeType(SkillLineEntry const* pSkill, bool racial)
{
switch(pSkill->categoryId)
{
@@ -7983,7 +7983,7 @@ void ObjectMgr::LoadGameTele()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 id = fields[0].GetUInt32();
@@ -8109,7 +8109,7 @@ void ObjectMgr::LoadMailLevelRewards()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint8 level = fields[0].GetUInt8();
uint32 raceMask = fields[1].GetUInt32();
@@ -8168,7 +8168,7 @@ void ObjectMgr::AddSpellToTrainer(uint32 entry, uint32 spell, uint32 spellCost,
return;
}
SpellInfo const *spellinfo = sSpellMgr->GetSpellInfo(spell);
SpellInfo const* spellinfo = sSpellMgr->GetSpellInfo(spell);
if (!spellinfo)
{
sLog->outErrorDb("Table `npc_trainer` contains an entry (Entry: %u) for a non-existing spell (Spell: %u), ignoring", entry, spell);
@@ -8641,7 +8641,7 @@ uint32 ObjectMgr::GetScriptId(const char *name)
void ObjectMgr::CheckScripts(ScriptsType type, std::set<int32>& ids)
{
ScriptMapMap *scripts = GetScriptsMapByType(type);
ScriptMapMap* scripts = GetScriptsMapByType(type);
if (!scripts)
return;
for (ScriptMapMap::const_iterator itrMM = scripts->begin(); itrMM != scripts->end(); ++itrMM)
@@ -8732,7 +8732,7 @@ void ObjectMgr::LoadCreatureClassLevelStats()
uint32 count = 0;
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint8 Level = fields[0].GetUInt8();
uint8 Class = fields[1].GetUInt8();
@@ -8794,7 +8794,7 @@ void ObjectMgr::LoadFactionChangeAchievements()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 alliance = fields[0].GetUInt32();
uint32 horde = fields[1].GetUInt32();
@@ -8831,7 +8831,7 @@ void ObjectMgr::LoadFactionChangeItems()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 alliance = fields[0].GetUInt32();
uint32 horde = fields[1].GetUInt32();
@@ -8868,7 +8868,7 @@ void ObjectMgr::LoadFactionChangeSpells()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 alliance = fields[0].GetUInt32();
uint32 horde = fields[1].GetUInt32();
@@ -8905,7 +8905,7 @@ void ObjectMgr::LoadFactionChangeReputations()
do
{
Field *fields = result->Fetch();
Field* fields = result->Fetch();
uint32 alliance = fields[0].GetUInt32();
uint32 horde = fields[1].GetUInt32();
src/server/game/Globals/ObjectMgr.h
+9 -9
View File
@@ -547,7 +547,7 @@ enum SkillRangeType
SKILL_RANGE_NONE, // 0..0 always
};
SkillRangeType GetSkillRangeType(SkillLineEntry const *pSkill, bool racial);
SkillRangeType GetSkillRangeType(SkillLineEntry const* pSkill, bool racial);
#define MAX_PLAYER_NAME 12 // max allowed by client name length
#define MAX_INTERNAL_PLAYER_NAME 15 // max server internal player name length (> MAX_PLAYER_NAME for support declined names)
@@ -625,17 +625,17 @@ class ObjectMgr
int LoadReferenceVendor(int32 vendor, int32 item_id, std::set<uint32> *skip_vendors);
void LoadGameObjectTemplate();
void AddGameobjectInfo(GameObjectTemplate *goinfo);
void AddGameobjectInfo(GameObjectTemplate* goinfo);
CreatureTemplate const* GetCreatureTemplate(uint32 entry);
CreatureTemplateContainer const* GetCreatureTemplates() { return &CreatureTemplateStore; }
CreatureModelInfo const* GetCreatureModelInfo(uint32 modelId);
CreatureModelInfo const* GetCreatureModelRandomGender(uint32* displayID);
static uint32 ChooseDisplayId(uint32 team, const CreatureTemplate *cinfo, const CreatureData *data = NULL);
static void ChooseCreatureFlags(const CreatureTemplate *cinfo, uint32& npcflag, uint32& unit_flags, uint32& dynamicflags, const CreatureData *data = NULL);
EquipmentInfo const *GetEquipmentInfo(uint32 entry);
CreatureAddon const *GetCreatureAddon(uint32 lowguid);
CreatureAddon const *GetCreatureTemplateAddon(uint32 entry);
static uint32 ChooseDisplayId(uint32 team, const CreatureTemplate* cinfo, const CreatureData* data = NULL);
static void ChooseCreatureFlags(const CreatureTemplate* cinfo, uint32& npcflag, uint32& unit_flags, uint32& dynamicflags, const CreatureData* data = NULL);
EquipmentInfo const* GetEquipmentInfo(uint32 entry);
CreatureAddon const* GetCreatureAddon(uint32 lowguid);
CreatureAddon const* GetCreatureTemplateAddon(uint32 entry);
ItemTemplate const* GetItemTemplate(uint32 entry);
ItemTemplateContainer const* GetItemTemplateStore() { return &ItemTemplateStore; }
@@ -708,8 +708,8 @@ class ObjectMgr
GossipText const* GetGossipText(uint32 Text_ID) const;
WorldSafeLocsEntry const *GetDefaultGraveYard(uint32 team);
WorldSafeLocsEntry const *GetClosestGraveYard(float x, float y, float z, uint32 MapId, uint32 team);
WorldSafeLocsEntry const* GetDefaultGraveYard(uint32 team);
WorldSafeLocsEntry const* GetClosestGraveYard(float x, float y, float z, uint32 MapId, uint32 team);
bool AddGraveYardLink(uint32 id, uint32 zone, uint32 team, bool inDB = true);
void RemoveGraveYardLink(uint32 id, uint32 zone, uint32 team, bool inDB = false);
void LoadGraveyardZones();