Cleanup/Core: Remove whitespace and tabs
--HG-- branch : trunk
This commit is contained in:
@@ -99,7 +99,7 @@ bool Map::ExistMap(uint32 mapid,int gx,int gy)
|
||||
sLog.outError("Map file '%s' is from an incompatible clientversion. Please recreate using the mapextractor.",tmp);
|
||||
else
|
||||
ret = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
delete [] tmp;
|
||||
fclose(pf); //close file before return
|
||||
@@ -1181,7 +1181,7 @@ bool GridMap::loadHeihgtData(FILE *in, uint32 offset, uint32 /*size*/)
|
||||
{
|
||||
map_heightHeader header;
|
||||
fseek(in, offset, SEEK_SET);
|
||||
|
||||
|
||||
if (fread(&header, sizeof(header), 1, in) != 1 || header.fourcc != uint32(MAP_HEIGHT_MAGIC))
|
||||
return false;
|
||||
|
||||
@@ -1227,7 +1227,7 @@ bool GridMap::loadLiquidData(FILE *in, uint32 offset, uint32 /*size*/)
|
||||
{
|
||||
map_liquidHeader header;
|
||||
fseek(in, offset, SEEK_SET);
|
||||
|
||||
|
||||
if (fread(&header, sizeof(header), 1, in) != 1 || header.fourcc != uint32(MAP_LIQUID_MAGIC))
|
||||
return false;
|
||||
|
||||
@@ -2812,7 +2812,7 @@ inline Unit* Map::_GetScriptUnit(Object* obj, bool isSource, const ScriptInfo* s
|
||||
{
|
||||
pUnit = dynamic_cast<Unit*>(obj);
|
||||
if (!pUnit)
|
||||
sLog.outError("%s %s object could not be casted to unit.",
|
||||
sLog.outError("%s %s object could not be casted to unit.",
|
||||
scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target");
|
||||
}
|
||||
return pUnit;
|
||||
@@ -2852,7 +2852,7 @@ inline WorldObject* Map::_GetScriptWorldObject(Object* obj, bool isSource, const
|
||||
{
|
||||
WorldObject* pWorldObject = NULL;
|
||||
if (!obj)
|
||||
sLog.outError("%s %s object is NULL.",
|
||||
sLog.outError("%s %s object is NULL.",
|
||||
scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target");
|
||||
else
|
||||
{
|
||||
@@ -3086,7 +3086,7 @@ void Map::ScriptsProcess()
|
||||
// Validate field number.
|
||||
if (step.script->datalong <= OBJECT_FIELD_ENTRY || step.script->datalong >= cSource->GetValuesCount())
|
||||
sLog.outError("%s wrong field %u (max count: %u) in object (TypeId: %u, Entry: %u, GUID: %u) specified, skipping.",
|
||||
step.script->GetDebugInfo().c_str(), step.script->datalong,
|
||||
step.script->GetDebugInfo().c_str(), step.script->datalong,
|
||||
cSource->GetValuesCount(), cSource->GetTypeId(), cSource->GetEntry(), cSource->GetGUIDLow());
|
||||
else
|
||||
cSource->SetUInt32Value(step.script->datalong, step.script->datalong2);
|
||||
@@ -3109,7 +3109,7 @@ void Map::ScriptsProcess()
|
||||
// Validate field number.
|
||||
if (step.script->datalong <= OBJECT_FIELD_ENTRY || step.script->datalong >= cSource->GetValuesCount())
|
||||
sLog.outError("%s wrong field %u (max count: %u) in object (TypeId: %u, Entry: %u, GUID: %u) specified, skipping.",
|
||||
step.script->GetDebugInfo().c_str(), step.script->datalong,
|
||||
step.script->GetDebugInfo().c_str(), step.script->datalong,
|
||||
source->GetValuesCount(), source->GetTypeId(), source->GetEntry(), source->GetGUIDLow());
|
||||
else
|
||||
cSource->SetFlag(step.script->datalong, step.script->datalong2);
|
||||
@@ -3123,7 +3123,7 @@ void Map::ScriptsProcess()
|
||||
// Validate field number.
|
||||
if (step.script->datalong <= OBJECT_FIELD_ENTRY || step.script->datalong >= cSource->GetValuesCount())
|
||||
sLog.outError("%s wrong field %u (max count: %u) in object (TypeId: %u, Entry: %u, GUID: %u) specified, skipping.",
|
||||
step.script->GetDebugInfo().c_str(), step.script->datalong,
|
||||
step.script->GetDebugInfo().c_str(), step.script->datalong,
|
||||
source->GetValuesCount(), source->GetTypeId(), source->GetEntry(), source->GetGUIDLow());
|
||||
else
|
||||
cSource->RemoveFlag(step.script->datalong, step.script->datalong2);
|
||||
@@ -3251,7 +3251,7 @@ void Map::ScriptsProcess()
|
||||
}
|
||||
worldObject = dynamic_cast<WorldObject*>(source);
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
pTarget = source->ToPlayer();
|
||||
if (pTarget)
|
||||
@@ -3267,7 +3267,7 @@ void Map::ScriptsProcess()
|
||||
else
|
||||
{
|
||||
sLog.outError("%s neither source nor target is player (source: TypeId: %u, Entry: %u, GUID: %u; target: TypeId: %u, Entry: %u, GUID: %u), skipping.",
|
||||
step.script->GetDebugInfo().c_str(),
|
||||
step.script->GetDebugInfo().c_str(),
|
||||
source ? source->GetTypeId() : 0, source ? source->GetEntry() : 0, source ? source->GetGUIDLow() : 0,
|
||||
target ? target->GetTypeId() : 0, target ? target->GetEntry() : 0, target ? target->GetGUIDLow() : 0);
|
||||
break;
|
||||
|
||||
@@ -212,7 +212,7 @@ BattlegroundMap* MapInstanced::CreateBattleground(uint32 InstanceId, Battlegroun
|
||||
PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(),bg->GetMinLevel());
|
||||
|
||||
uint8 spawnMode;
|
||||
|
||||
|
||||
if (bracketEntry)
|
||||
spawnMode = bracketEntry->difficulty;
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user