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

Core: Generic cleanup (tab2spaces/trailing whitespace removal)

Browse Source
This commit is contained in:
leak
2011-01-26 01:03:35 +01:00
parent 57f85ab7da
commit 137b079eea
57 changed files with 252 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Globals/ObjectMgr.cpp
+14 -14
View File
@@ -1237,7 +1237,7 @@ void ObjectMgr::LoadLinkedRespawn()
error = true;
break;
}
guid = MAKE_NEW_GUID(guidLow, slave->id, HIGHGUID_UNIT);
linkedGuid = MAKE_NEW_GUID(linkedGuidLow, master->id, HIGHGUID_UNIT);
break;
@@ -1332,8 +1332,8 @@ void ObjectMgr::LoadLinkedRespawn()
sLog->outErrorDb("Couldn't get creature data for GUIDLow %u", linkedGuidLow);
error = true;
break;
}
}
const MapEntry* const map = sMapStore.LookupEntry(master->mapid);
if (!map || !map->Instanceable() || (master->mapid != slave->mapid))
{
@@ -1396,7 +1396,7 @@ bool ObjectMgr::SetCreatureLinkedRespawn(uint32 guidLow, uint32 linkedGuidLow)
sLog->outErrorDb("LinkedRespawn: Creature '%u' linking to '%u' with not corresponding spawnMask", guidLow, linkedGuidLow);
return false;
}
uint64 linkedGuid = MAKE_NEW_GUID(linkedGuidLow, slave->id, HIGHGUID_UNIT);
mLinkedRespawnMap[guid] = linkedGuid;
@@ -1774,7 +1774,7 @@ uint32 ObjectMgr::AddCreData(uint32 entry, uint32 /*team*/, uint32 mapId, float
void ObjectMgr::LoadGameobjects()
{
uint32 oldMSTime = getMSTime();
uint32 count = 0;
// 0 1 2 3 4 5 6
@@ -2695,7 +2695,7 @@ void ObjectMgr::LoadItemSetNames()
itemSetItems.erase(entry);
++count;
} while (result->NextRow());
if (!itemSetItems.empty())
{
@@ -3969,8 +3969,8 @@ void ObjectMgr::LoadGroups()
CharacterDatabase.Execute(CharacterDatabase.GetPreparedStatement(CHAR_DEL_TINY_GROUPS));
// 0 1 2 3 4 5 6 7 8 9
QueryResult result = CharacterDatabase.PQuery("SELECT leaderGuid, lootMethod, looterGuid, lootThreshold, icon1, icon2, icon3, icon4, icon5, icon6"
// 10 11 12 13 14 15
QueryResult result = CharacterDatabase.PQuery("SELECT leaderGuid, lootMethod, looterGuid, lootThreshold, icon1, icon2, icon3, icon4, icon5, icon6"
// 10 11 12 13 14 15
",icon7, icon8, groupType, difficulty, raiddifficulty, guid FROM groups");
if (!result)
{
@@ -7067,10 +7067,10 @@ uint32 ObjectMgr::GeneratePetNumber()
void ObjectMgr::LoadCorpses()
{
uint32 oldMSTime = getMSTime();
// 0 1 2 3 4 5 6 7 8 9 10 11
QueryResult result = CharacterDatabase.Query("SELECT position_x, position_y, position_z, orientation, map, displayId, itemCache, bytes1, bytes2, guild, flags, dynFlags"
// 12 13 14 15 16 17
// 12 13 14 15 16 17
", time, corpse_type, instance, phaseMask, guid, player FROM corpse WHERE corpse_type <> 0");
if (!result)
@@ -7604,7 +7604,7 @@ void ObjectMgr::SaveCreatureRespawnTime(uint32 loguid, uint32 instance, time_t t
RemoveCreatureRespawnTime(loguid, instance);
return;
}
// This function can be called from various map threads concurrently
{
m_CreatureRespawnTimesMtx.acquire();
@@ -7652,7 +7652,7 @@ void ObjectMgr::SaveGORespawnTime(uint32 loguid, uint32 instance, time_t t)
RemoveGORespawnTime(loguid, instance);
return;
}
// This function can be called from different map threads concurrently
{
m_GORespawnTimesMtx.acquire();
@@ -8179,7 +8179,7 @@ bool ObjectMgr::LoadTrinityStrings(char const* table, int32 min_value, int32 max
}
} while (result->NextRow());
if (min_value == MIN_TRINITY_STRING_ID)
sLog->outString(">> Loaded %u Trinity strings from table %s in %u ms", count, table, GetMSTimeDiffToNow(oldMSTime));
else
@@ -8587,7 +8587,7 @@ void ObjectMgr::LoadTrainerSpell()
}
uint32 count = 0;
do
{