mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[7506] Remove dual ERROR in logs

Browse source
This commit is contained in:
AlexDereka 2009-03-21 11:47:43 +03:00
parent f6954b0661
commit 8a5e4706bc
18 changed files with 55 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/BattleGround.cpp
View file

@ -1048,7 +1048,7 @@ void BattleGround::Reset()
m_Events = 0; m_Events = 0;
if (m_InvitedAlliance > 0 || m_InvitedHorde > 0) if (m_InvitedAlliance > 0 || m_InvitedHorde > 0)
sLog.outError("BattleGround system ERROR: bad counter, m_InvitedAlliance: %d, m_InvitedHorde: %d", m_InvitedAlliance, m_InvitedHorde); sLog.outError("BattleGround system: bad counter, m_InvitedAlliance: %d, m_InvitedHorde: %d", m_InvitedAlliance, m_InvitedHorde);
m_InvitedAlliance = 0; m_InvitedAlliance = 0;
m_InvitedHorde = 0; m_InvitedHorde = 0;
@ -1460,7 +1460,7 @@ Creature* BattleGround::AddCreature(uint32 entry, uint32 type, uint32 teamval, f
if(!pCreature->IsPositionValid()) if(!pCreature->IsPositionValid())
{ {
sLog.outError("ERROR: Creature (guidlow %d, entry %d) not added to battleground. Suggested coordinates isn't valid (X: %f Y: %f)",pCreature->GetGUIDLow(),pCreature->GetEntry(),pCreature->GetPositionX(),pCreature->GetPositionY()); sLog.outError("Creature (guidlow %d, entry %d) not added to battleground. Suggested coordinates isn't valid (X: %f Y: %f)",pCreature->GetGUIDLow(),pCreature->GetEntry(),pCreature->GetPositionX(),pCreature->GetPositionY());
return NULL; return NULL;
} }

10
src/game/Corpse.cpp
View file

@ -76,7 +76,7 @@ bool Corpse::Create( uint32 guidlow, Player *owner)
if(!IsPositionValid()) if(!IsPositionValid())
{ {
sLog.outError("ERROR: Corpse (guidlow %d, owner %s) not created. Suggested coordinates isn't valid (X: %f Y: %f)", sLog.outError("Corpse (guidlow %d, owner %s) not created. Suggested coordinates isn't valid (X: %f Y: %f)",
guidlow,owner->GetName(),owner->GetPositionX(), owner->GetPositionY()); guidlow,owner->GetName(),owner->GetPositionX(), owner->GetPositionY());
return false; return false;
} }
@ -153,7 +153,7 @@ bool Corpse::LoadFromDB(uint32 guid, QueryResult *result)
if( ! result ) if( ! result )
{ {
sLog.outError("ERROR: Corpse (GUID: %u) not found in table `corpse`, can't load. ",guid); sLog.outError("Corpse (GUID: %u) not found in table `corpse`, can't load. ",guid);
return false; return false;
} }
@ -181,7 +181,7 @@ bool Corpse::LoadFromDB(uint32 guid, Field *fields)
if(!LoadValues( fields[5].GetString() )) if(!LoadValues( fields[5].GetString() ))
{ {
sLog.outError("ERROR: Corpse #%d have broken data in `data` field. Can't be loaded.",guid); sLog.outError("Corpse #%d have broken data in `data` field. Can't be loaded.",guid);
return false; return false;
} }
@ -189,7 +189,7 @@ bool Corpse::LoadFromDB(uint32 guid, Field *fields)
m_type = CorpseType(fields[7].GetUInt32()); m_type = CorpseType(fields[7].GetUInt32());
if(m_type >= MAX_CORPSE_TYPE) if(m_type >= MAX_CORPSE_TYPE)
{ {
sLog.outError("ERROR: Corpse (guidlow %d, owner %d) have wrong corpse type, not load.",GetGUIDLow(),GUID_LOPART(GetOwnerGUID())); sLog.outError("Corpse (guidlow %d, owner %d) have wrong corpse type, not load.",GetGUIDLow(),GUID_LOPART(GetOwnerGUID()));
return false; return false;
} }
uint32 instanceid = fields[8].GetUInt32(); uint32 instanceid = fields[8].GetUInt32();
@ -206,7 +206,7 @@ bool Corpse::LoadFromDB(uint32 guid, Field *fields)
if(!IsPositionValid()) if(!IsPositionValid())
{ {
sLog.outError("ERROR: Corpse (guidlow %d, owner %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)", sLog.outError("Corpse (guidlow %d, owner %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",
GetGUIDLow(),GUID_LOPART(GetOwnerGUID()),GetPositionX(),GetPositionY()); GetGUIDLow(),GUID_LOPART(GetOwnerGUID()),GetPositionX(),GetPositionY());
return false; return false;
} }

4
src/game/Creature.cpp
View file

@ -1252,7 +1252,7 @@ bool Creature::CreateFromProto(uint32 guidlow, uint32 Entry, uint32 team, const
CreatureInfo const *cinfo = objmgr.GetCreatureTemplate(Entry); CreatureInfo const *cinfo = objmgr.GetCreatureTemplate(Entry);
if(!cinfo) if(!cinfo)
{ {
sLog.outErrorDb("Error: creature entry %u does not exist.", Entry); sLog.outErrorDb("Creature entry %u does not exist.", Entry);
return false; return false;
} }
m_originalEntry = Entry; m_originalEntry = Entry;
@ -1295,7 +1295,7 @@ bool Creature::LoadFromDB(uint32 guid, Map *map)
if(!IsPositionValid()) if(!IsPositionValid())
{ {
sLog.outError("ERROR: Creature (guidlow %d, entry %d) not loaded. Suggested coordinates isn't valid (X: %f Y: %f)",GetGUIDLow(),GetEntry(),GetPositionX(),GetPositionY()); sLog.outError("Creature (guidlow %d, entry %d) not loaded. Suggested coordinates isn't valid (X: %f Y: %f)",GetGUIDLow(),GetEntry(),GetPositionX(),GetPositionY());
return false; return false;
} }

2
src/game/DynamicObject.cpp
View file

@ -59,7 +59,7 @@ bool DynamicObject::Create( uint32 guidlow, Unit *caster, uint32 spellId, uint32
if(!IsPositionValid()) if(!IsPositionValid())
{ {
sLog.outError("ERROR: DynamicObject (spell %u eff %u) not created. Suggested coordinates isn't valid (X: %f Y: %f)",spellId,effIndex,GetPositionX(),GetPositionY()); sLog.outError("DynamicObject (spell %u eff %u) not created. Suggested coordinates isn't valid (X: %f Y: %f)",spellId,effIndex,GetPositionX(),GetPositionY());
return false; return false;
} }

4
src/game/GameObject.cpp
View file

@ -97,7 +97,7 @@ bool GameObject::Create(uint32 guidlow, uint32 name_id, Map *map, uint32 phaseMa
if(!IsPositionValid()) if(!IsPositionValid())
{ {
sLog.outError("ERROR: Gameobject (GUID: %u Entry: %u ) not created. Suggested coordinates isn't valid (X: %f Y: %f)",guidlow,name_id,x,y); sLog.outError("Gameobject (GUID: %u Entry: %u ) not created. Suggested coordinates isn't valid (X: %f Y: %f)",guidlow,name_id,x,y);
return false; return false;
} }
@ -560,7 +560,7 @@ bool GameObject::LoadFromDB(uint32 guid, Map *map)
if( !data ) if( !data )
{ {
sLog.outErrorDb("ERROR: Gameobject (GUID: %u) not found in table `gameobject`, can't load. ",guid); sLog.outErrorDb("Gameobject (GUID: %u) not found in table `gameobject`, can't load. ",guid);
return false; return false;
} }

4
src/game/Item.cpp
View file

@ -348,7 +348,7 @@ bool Item::LoadFromDB(uint32 guid, uint64 owner_guid, QueryResult *result)
if (!result) if (!result)
{ {
sLog.outError("ERROR: Item (GUID: %u owner: %u) not found in table `item_instance`, can't load. ",guid,GUID_LOPART(owner_guid)); sLog.outError("Item (GUID: %u owner: %u) not found in table `item_instance`, can't load. ",guid,GUID_LOPART(owner_guid));
return false; return false;
} }
@ -356,7 +356,7 @@ bool Item::LoadFromDB(uint32 guid, uint64 owner_guid, QueryResult *result)
if(!LoadValues(fields[0].GetString())) if(!LoadValues(fields[0].GetString()))
{ {
sLog.outError("ERROR: Item #%d have broken data in `data` field. Can't be loaded.",guid); sLog.outError("Item #%d have broken data in `data` field. Can't be loaded.",guid);
if (delete_result) delete result; if (delete_result) delete result;
return false; return false;
} }

12
src/game/Level2.cpp
View file

@ -1102,7 +1102,7 @@ bool ChatHandler::HandleNpcAddCommand(const char* args)
if(!pCreature->IsPositionValid()) if(!pCreature->IsPositionValid())
{ {
sLog.outError("ERROR: Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",pCreature->GetGUIDLow(),pCreature->GetEntry(),pCreature->GetPositionX(),pCreature->GetPositionY()); sLog.outError("Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",pCreature->GetGUIDLow(),pCreature->GetEntry(),pCreature->GetPositionX(),pCreature->GetPositionY());
delete pCreature; delete pCreature;
return false; return false;
} }
@ -2903,7 +2903,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args)
if(!wpCreature->IsPositionValid()) if(!wpCreature->IsPositionValid())
{ {
sLog.outError("ERROR: Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",wpCreature->GetGUIDLow(),wpCreature->GetEntry(),wpCreature->GetPositionX(),wpCreature->GetPositionY()); sLog.outError("Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",wpCreature->GetGUIDLow(),wpCreature->GetEntry(),wpCreature->GetPositionX(),wpCreature->GetPositionY());
delete wpCreature; delete wpCreature;
} }
else else
@ -3025,7 +3025,7 @@ bool ChatHandler::HandleWpModifyCommand(const char* args)
if(!wpCreature2->IsPositionValid()) if(!wpCreature2->IsPositionValid())
{ {
sLog.outError("ERROR: Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",wpCreature2->GetGUIDLow(),wpCreature2->GetEntry(),wpCreature2->GetPositionX(),wpCreature2->GetPositionY()); sLog.outError("Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",wpCreature2->GetGUIDLow(),wpCreature2->GetEntry(),wpCreature2->GetPositionX(),wpCreature2->GetPositionY());
delete wpCreature2; delete wpCreature2;
return false; return false;
} }
@ -3331,7 +3331,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
if(!wpCreature->IsPositionValid()) if(!wpCreature->IsPositionValid())
{ {
sLog.outError("ERROR: Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",wpCreature->GetGUIDLow(),wpCreature->GetEntry(),wpCreature->GetPositionX(),wpCreature->GetPositionY()); sLog.outError("Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",wpCreature->GetGUIDLow(),wpCreature->GetEntry(),wpCreature->GetPositionX(),wpCreature->GetPositionY());
delete wpCreature; delete wpCreature;
delete result; delete result;
return false; return false;
@ -3389,7 +3389,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
if(!pCreature->IsPositionValid()) if(!pCreature->IsPositionValid())
{ {
sLog.outError("ERROR: Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",pCreature->GetGUIDLow(),pCreature->GetEntry(),pCreature->GetPositionX(),pCreature->GetPositionY()); sLog.outError("Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",pCreature->GetGUIDLow(),pCreature->GetEntry(),pCreature->GetPositionX(),pCreature->GetPositionY());
delete pCreature; delete pCreature;
delete result; delete result;
return false; return false;
@ -3449,7 +3449,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
if(!pCreature->IsPositionValid()) if(!pCreature->IsPositionValid())
{ {
sLog.outError("ERROR: Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",pCreature->GetGUIDLow(),pCreature->GetEntry(),pCreature->GetPositionX(),pCreature->GetPositionY()); sLog.outError("Creature (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",pCreature->GetGUIDLow(),pCreature->GetEntry(),pCreature->GetPositionX(),pCreature->GetPositionY());
delete pCreature; delete pCreature;
delete result; delete result;
return false; return false;

4
src/game/Map.cpp
View file

@ -1737,7 +1737,7 @@ bool Map::CheckGridIntegrity(Creature* c, bool moved) const
Cell xy_cell(xy_val); Cell xy_cell(xy_val);
if(xy_cell != cur_cell) if(xy_cell != cur_cell)
{ {
sLog.outError("ERROR: %s (GUID: %u) X: %f Y: %f (%s) in grid[%u,%u]cell[%u,%u] instead grid[%u,%u]cell[%u,%u]", sLog.outError("%s (GUID: %u) X: %f Y: %f (%s) in grid[%u,%u]cell[%u,%u] instead grid[%u,%u]cell[%u,%u]",
(c->GetTypeId()==TYPEID_PLAYER ? "Player" : "Creature"),c->GetGUIDLow(), (c->GetTypeId()==TYPEID_PLAYER ? "Player" : "Creature"),c->GetGUIDLow(),
c->GetPositionX(),c->GetPositionY(),(moved ? "final" : "original"), c->GetPositionX(),c->GetPositionY(),(moved ? "final" : "original"),
cur_cell.GridX(), cur_cell.GridY(), cur_cell.CellX(), cur_cell.CellY(), cur_cell.GridX(), cur_cell.GridY(), cur_cell.CellX(), cur_cell.CellY(),
@ -1946,7 +1946,7 @@ void Map::RemoveAllObjectsInRemoveList()
{ {
Corpse* corpse = ObjectAccessor::Instance().GetCorpse(*obj, obj->GetGUID()); Corpse* corpse = ObjectAccessor::Instance().GetCorpse(*obj, obj->GetGUID());
if (!corpse) if (!corpse)
sLog.outError("ERROR: Try delete corpse/bones %u that not in map", obj->GetGUIDLow()); sLog.outError("Try delete corpse/bones %u that not in map", obj->GetGUIDLow());
else else
Remove(corpse,true); Remove(corpse,true);
break; break;

4
src/game/Object.cpp
View file

@ -1017,7 +1017,7 @@ void Object::RemoveByteFlag( uint16 index, uint8 offset, uint8 oldFlag )
bool Object::PrintIndexError(uint32 index, bool set) const bool Object::PrintIndexError(uint32 index, bool set) const
{ {
sLog.outError("ERROR: Attempt %s non-existed value field: %u (count: %u) for object typeid: %u type mask: %u",(set ? "set value to" : "get value from"),index,m_valuesCount,GetTypeId(),m_objectType); sLog.outError("Attempt %s non-existed value field: %u (count: %u) for object typeid: %u type mask: %u",(set ? "set value to" : "get value from"),index,m_valuesCount,GetTypeId(),m_objectType);
// assert must fail after function call // assert must fail after function call
return false; return false;
@ -1457,7 +1457,7 @@ Creature* WorldObject::SummonCreature(uint32 id, float x, float y, float z, floa
if(!pCreature->IsPositionValid()) if(!pCreature->IsPositionValid())
{ {
sLog.outError("ERROR: Creature (guidlow %d, entry %d) not summoned. Suggested coordinates isn't valid (X: %f Y: %f)",pCreature->GetGUIDLow(),pCreature->GetEntry(),pCreature->GetPositionX(),pCreature->GetPositionY()); sLog.outError("Creature (guidlow %d, entry %d) not summoned. Suggested coordinates isn't valid (X: %f Y: %f)",pCreature->GetGUIDLow(),pCreature->GetEntry(),pCreature->GetPositionX(),pCreature->GetPositionY());
delete pCreature; delete pCreature;
return NULL; return NULL;
} }

2
src/game/ObjectAccessor.cpp
View file

@ -404,7 +404,7 @@ ObjectAccessor::ConvertCorpseForPlayer(uint64 player_guid, bool insignia)
{ {
//in fact this function is called from several places //in fact this function is called from several places
//even when player doesn't have a corpse, not an error //even when player doesn't have a corpse, not an error
//sLog.outError("ERROR: Try remove corpse that not in map for GUID %ul", player_guid); //sLog.outError("Try remove corpse that not in map for GUID %ul", player_guid);
return NULL; return NULL;
} }

10
src/game/Pet.cpp
View file

@ -146,7 +146,7 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
if(!IsPositionValid()) if(!IsPositionValid())
{ {
sLog.outError("ERROR: Pet (guidlow %d, entry %d) not loaded. Suggested coordinates isn't valid (X: %f Y: %f)", sLog.outError("Pet (guidlow %d, entry %d) not loaded. Suggested coordinates isn't valid (X: %f Y: %f)",
GetGUIDLow(), GetEntry(), GetPositionX(), GetPositionY()); GetGUIDLow(), GetEntry(), GetPositionX(), GetPositionY());
delete result; delete result;
return false; return false;
@ -704,7 +704,7 @@ bool Pet::CreateBaseAtCreature(Creature* creature)
{ {
if(!creature) if(!creature)
{ {
sLog.outError("CRITICAL ERROR: NULL pointer parsed into CreateBaseAtCreature()"); sLog.outError("CRITICAL: NULL pointer parsed into CreateBaseAtCreature()");
return false; return false;
} }
uint32 guid=objmgr.GenerateLowGuid(HIGHGUID_PET); uint32 guid=objmgr.GenerateLowGuid(HIGHGUID_PET);
@ -721,7 +721,7 @@ bool Pet::CreateBaseAtCreature(Creature* creature)
if(!IsPositionValid()) if(!IsPositionValid())
{ {
sLog.outError("ERROR: Pet (guidlow %d, entry %d) not created base at creature. Suggested coordinates isn't valid (X: %f Y: %f)", sLog.outError("Pet (guidlow %d, entry %d) not created base at creature. Suggested coordinates isn't valid (X: %f Y: %f)",
GetGUIDLow(), GetEntry(), GetPositionX(), GetPositionY()); GetGUIDLow(), GetEntry(), GetPositionX(), GetPositionY());
return false; return false;
} }
@ -729,7 +729,7 @@ bool Pet::CreateBaseAtCreature(Creature* creature)
CreatureInfo const *cinfo = GetCreatureInfo(); CreatureInfo const *cinfo = GetCreatureInfo();
if(!cinfo) if(!cinfo)
{ {
sLog.outError("ERROR: CreateBaseAtCreature() failed, creatureInfo is missing!"); sLog.outError("CreateBaseAtCreature() failed, creatureInfo is missing!");
return false; return false;
} }
@ -771,7 +771,7 @@ bool Pet::InitStatsForLevel(uint32 petlevel)
Unit* owner = GetOwner(); Unit* owner = GetOwner();
if(!owner) if(!owner)
{ {
sLog.outError("ERROR: attempt to summon pet (Entry %u) without owner! Attempt terminated.", cinfo->Entry); sLog.outError("attempt to summon pet (Entry %u) without owner! Attempt terminated.", cinfo->Entry);
return false; return false;
} }

24
src/game/Player.cpp
View file

@ -4231,7 +4231,7 @@ uint32 Player::DurabilityRepair(uint16 pos, bool cost, float discountMod, bool g
DurabilityCostsEntry const *dcost = sDurabilityCostsStore.LookupEntry(ditemProto->ItemLevel); DurabilityCostsEntry const *dcost = sDurabilityCostsStore.LookupEntry(ditemProto->ItemLevel);
if(!dcost) if(!dcost)
{ {
sLog.outError("ERROR: RepairDurability: Wrong item lvl %u", ditemProto->ItemLevel); sLog.outError("RepairDurability: Wrong item lvl %u", ditemProto->ItemLevel);
return TotalCost; return TotalCost;
} }
@ -4239,7 +4239,7 @@ uint32 Player::DurabilityRepair(uint16 pos, bool cost, float discountMod, bool g
DurabilityQualityEntry const *dQualitymodEntry = sDurabilityQualityStore.LookupEntry(dQualitymodEntryId); DurabilityQualityEntry const *dQualitymodEntry = sDurabilityQualityStore.LookupEntry(dQualitymodEntryId);
if(!dQualitymodEntry) if(!dQualitymodEntry)
{ {
sLog.outError("ERROR: RepairDurability: Wrong dQualityModEntry %u", dQualitymodEntryId); RepairDurabilitRepairDurability: Wrong dQualityModEntry %u", dQualitymodEntryId);
return TotalCost; return TotalCost;
} }
@ -4482,7 +4482,7 @@ float Player::GetBaseModValue(BaseModGroup modGroup, BaseModType modType) const
{ {
if(modGroup >= BASEMOD_END || modType > MOD_END) if(modGroup >= BASEMOD_END || modType > MOD_END)
{ {
sLog.outError("ERROR: trial to access non existed BaseModGroup or wrong BaseModType!"); sLog.outError("trial to access non existed BaseModGroup or wrong BaseModType!");
return 0.0f; return 0.0f;
} }
@ -4496,7 +4496,7 @@ float Player::GetTotalBaseModValue(BaseModGroup modGroup) const
{ {
if(modGroup >= BASEMOD_END) if(modGroup >= BASEMOD_END)
{ {
sLog.outError("ERROR: wrong BaseModGroup in GetTotalBaseModValue()!"); sLog.outError("wrong BaseModGroup in GetTotalBaseModValue()!");
return 0.0f; return 0.0f;
} }
@ -5507,7 +5507,7 @@ void Player::CheckExploreSystem()
if(offset >= 128) if(offset >= 128)
{ {
sLog.outError("ERROR: Wrong area flag %u in map data for (X: %f Y: %f) point to field PLAYER_EXPLORED_ZONES_1 + %u ( %u must be < 128 ).",areaFlag,GetPositionX(),GetPositionY(),offset,offset); sLog.outError("Wrong area flag %u in map data for (X: %f Y: %f) point to field PLAYER_EXPLORED_ZONES_1 + %u ( %u must be < 128 ).",areaFlag,GetPositionX(),GetPositionY(),offset,offset);
return; return;
} }
@ -14026,7 +14026,7 @@ bool Player::MinimalLoadFromDB( QueryResult *result, uint32 guid )
if(!LoadValues( fields[1].GetString())) if(!LoadValues( fields[1].GetString()))
{ {
sLog.outError("ERROR: Player #%d have broken data in `data` field. Can't be loaded for character list.",GUID_LOPART(guid)); sLog.outError("Player #%d have broken data in `data` field. Can't be loaded for character list.",GUID_LOPART(guid));
if(delete_result) delete result; if(delete_result) delete result;
return false; return false;
} }
@ -14189,7 +14189,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
if(!result) if(!result)
{ {
sLog.outError("ERROR: Player (GUID: %u) not found in table `characters`, can't load. ",guid); sLog.outError("Player (GUID: %u) not found in table `characters`, can't load. ",guid);
return false; return false;
} }
@ -14201,7 +14201,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
// player should be able to load/delete character only with correct account! // player should be able to load/delete character only with correct account!
if( dbAccountId != GetSession()->GetAccountId() ) if( dbAccountId != GetSession()->GetAccountId() )
{ {
sLog.outError("ERROR: Player (GUID: %u) loading from wrong account (is: %u, should be: %u)",guid,GetSession()->GetAccountId(),dbAccountId); sLog.outError("Player (GUID: %u) loading from wrong account (is: %u, should be: %u)",guid,GetSession()->GetAccountId(),dbAccountId);
delete result; delete result;
return false; return false;
} }
@ -14220,7 +14220,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
if(!LoadValues( fields[2].GetString())) if(!LoadValues( fields[2].GetString()))
{ {
sLog.outError("ERROR: Player #%d have broken data in `data` field. Can't be loaded.",GUID_LOPART(guid)); sLog.outError("Player #%d have broken data in `data` field. Can't be loaded.",GUID_LOPART(guid));
delete result; delete result;
return false; return false;
} }
@ -14298,7 +14298,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
if(!IsPositionValid()) if(!IsPositionValid())
{ {
sLog.outError("ERROR: Player (guidlow %d) have invalid coordinates (X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.",guid,GetPositionX(),GetPositionY(),GetPositionZ(),GetOrientation()); sLog.outError("Player (guidlow %d) have invalid coordinates (X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.",guid,GetPositionX(),GetPositionY(),GetPositionZ(),GetOrientation());
RelocateToHomebind(); RelocateToHomebind();
transGUID = 0; transGUID = 0;
@ -14374,7 +14374,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
// transport size limited // transport size limited
m_movementInfo.t_x > 50 || m_movementInfo.t_y > 50 || m_movementInfo.t_z > 50 ) m_movementInfo.t_x > 50 || m_movementInfo.t_y > 50 || m_movementInfo.t_z > 50 )
{ {
sLog.outError("ERROR: Player (guidlow %d) have invalid transport coordinates (X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.", sLog.outError("Player (guidlow %d) have invalid transport coordinates (X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.",
guid,GetPositionX()+m_movementInfo.t_x,GetPositionY()+m_movementInfo.t_y, guid,GetPositionX()+m_movementInfo.t_x,GetPositionY()+m_movementInfo.t_y,
GetPositionZ()+m_movementInfo.t_z,GetOrientation()+m_movementInfo.t_o); GetPositionZ()+m_movementInfo.t_z,GetOrientation()+m_movementInfo.t_o);
@ -14412,7 +14412,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
if(!m_transport) if(!m_transport)
{ {
sLog.outError("ERROR: Player (guidlow %d) have problems with transport guid (%u). Teleport to default race/class locations.", sLog.outError("Player (guidlow %d) have problems with transport guid (%u). Teleport to default race/class locations.",
guid,transGUID); guid,transGUID);
RelocateToHomebind(); RelocateToHomebind();

8
src/game/SpellEffects.cpp
View file

@ -3272,7 +3272,7 @@ void Spell::EffectSummon(uint32 i)
if(!spawnCreature->IsPositionValid()) if(!spawnCreature->IsPositionValid())
{ {
sLog.outError("ERROR: Pet (guidlow %d, entry %d) not summoned. Suggested coordinates isn't valid (X: %f Y: %f)", sLog.outError("Pet (guidlow %d, entry %d) not summoned. Suggested coordinates isn't valid (X: %f Y: %f)",
spawnCreature->GetGUIDLow(), spawnCreature->GetEntry(), spawnCreature->GetPositionX(), spawnCreature->GetPositionY()); spawnCreature->GetGUIDLow(), spawnCreature->GetEntry(), spawnCreature->GetPositionX(), spawnCreature->GetPositionY());
delete spawnCreature; delete spawnCreature;
return; return;
@ -3705,7 +3705,7 @@ void Spell::EffectSummonGuardian(uint32 i)
if(!spawnCreature->IsPositionValid()) if(!spawnCreature->IsPositionValid())
{ {
sLog.outError("ERROR: Pet (guidlow %d, entry %d) not created base at creature. Suggested coordinates isn't valid (X: %f Y: %f)", sLog.outError("Pet (guidlow %d, entry %d) not created base at creature. Suggested coordinates isn't valid (X: %f Y: %f)",
spawnCreature->GetGUIDLow(), spawnCreature->GetEntry(), spawnCreature->GetPositionX(), spawnCreature->GetPositionY()); spawnCreature->GetGUIDLow(), spawnCreature->GetEntry(), spawnCreature->GetPositionX(), spawnCreature->GetPositionY());
delete spawnCreature; delete spawnCreature;
return; return;
@ -4176,7 +4176,7 @@ void Spell::EffectSummonPet(uint32 i)
if(!NewSummon->IsPositionValid()) if(!NewSummon->IsPositionValid())
{ {
sLog.outError("ERROR: Pet (guidlow %d, entry %d) not summoned. Suggested coordinates isn't valid (X: %f Y: %f)", sLog.outError("Pet (guidlow %d, entry %d) not summoned. Suggested coordinates isn't valid (X: %f Y: %f)",
NewSummon->GetGUIDLow(), NewSummon->GetEntry(), NewSummon->GetPositionX(), NewSummon->GetPositionY()); NewSummon->GetGUIDLow(), NewSummon->GetEntry(), NewSummon->GetPositionX(), NewSummon->GetPositionY());
delete NewSummon; delete NewSummon;
return; return;
@ -5945,7 +5945,7 @@ void Spell::EffectSummonCritter(uint32 i)
if(!critter->IsPositionValid()) if(!critter->IsPositionValid())
{ {
sLog.outError("ERROR: Pet (guidlow %d, entry %d) not summoned. Suggested coordinates isn't valid (X: %f Y: %f)", sLog.outError("sLog.outError("Pet (guidlow %d, entry %d) not summoned. Suggested coordinates isn't valid (X: %f Y: %f)",
critter->GetGUIDLow(), critter->GetEntry(), critter->GetPositionX(), critter->GetPositionY()); critter->GetGUIDLow(), critter->GetEntry(), critter->GetPositionX(), critter->GetPositionY());
delete critter; delete critter;
return; return;

2
src/game/Transports.cpp
View file

@ -147,7 +147,7 @@ bool Transport::Create(uint32 guidlow, uint32 mapid, float x, float y, float z,
if(!IsPositionValid()) if(!IsPositionValid())
{ {
sLog.outError("ERROR: Transport (GUID: %u) not created. Suggested coordinates isn't valid (X: %f Y: %f)", sLog.outError("Transport (GUID: %u) not created. Suggested coordinates isn't valid (X: %f Y: %f)",
guidlow,x,y); guidlow,x,y);
return false; return false;
} }

6
src/game/Unit.cpp
View file

@ -9775,7 +9775,7 @@ float Unit::GetModifierValue(UnitMods unitMod, UnitModifierType modifierType) co
{ {
if( unitMod >= UNIT_MOD_END || modifierType >= MODIFIER_TYPE_END) if( unitMod >= UNIT_MOD_END || modifierType >= MODIFIER_TYPE_END)
{ {
sLog.outError("ERROR: trial to access non existed modifier value from UnitMods!"); sLog.outError("trial to access non existed modifier value from UnitMods!");
return 0.0f; return 0.0f;
} }
@ -9805,7 +9805,7 @@ float Unit::GetTotalAuraModValue(UnitMods unitMod) const
{ {
if(unitMod >= UNIT_MOD_END) if(unitMod >= UNIT_MOD_END)
{ {
sLog.outError("ERROR: trial to access non existed UnitMods in GetTotalAuraModValue()!"); sLog.outError("trial to access non existed UnitMods in GetTotalAuraModValue()!");
return 0.0f; return 0.0f;
} }
@ -11235,7 +11235,7 @@ Pet* Unit::CreateTamedPetFrom(Creature* creatureTarget,uint32 spell_id)
if(!pet->InitStatsForLevel(level)) if(!pet->InitStatsForLevel(level))
{ {
sLog.outError("ERROR: Pet::InitStatsForLevel() failed for creature (Entry: %u)!",creatureTarget->GetEntry()); sLog.outError("Pet::InitStatsForLevel() failed for creature (Entry: %u)!",creatureTarget->GetEntry());
delete pet; delete pet;
return NULL; return NULL;
} }

6
src/game/WaypointManager.cpp
View file

@ -108,10 +108,10 @@ void WaypointManager::Load()
{ {
QueryResult *result1 = WorldDatabase.PQuery("SELECT id, map FROM creature WHERE guid = '%u'", id); QueryResult *result1 = WorldDatabase.PQuery("SELECT id, map FROM creature WHERE guid = '%u'", id);
if(result1) if(result1)
sLog.outErrorDb("ERROR: Creature (guidlow %d, entry %d) have invalid coordinates in his waypoint %d (X: %f, Y: %f).", sLog.outErrorDb("Creature (guidlow %d, entry %d) have invalid coordinates in his waypoint %d (X: %f, Y: %f).",
id, result1->Fetch()[0].GetUInt32(), point, node.x, node.y); id, result1->Fetch()[0].GetUInt32(), point, node.x, node.y);
else else
sLog.outErrorDb("ERROR: Waypoint path %d, have invalid coordinates in his waypoint %d (X: %f, Y: %f).", sLog.outErrorDb("Waypoint path %d, have invalid coordinates in his waypoint %d (X: %f, Y: %f).",
id, point, node.x, node.y); id, point, node.x, node.y);
MaNGOS::NormalizeMapCoord(node.x); MaNGOS::NormalizeMapCoord(node.x);
@ -327,7 +327,7 @@ void WaypointManager::CheckTextsExistance(std::set<int32>& ids)
{ {
if (!objmgr.GetMangosStringLocale(be->textid[j])) if (!objmgr.GetMangosStringLocale(be->textid[j]))
{ {
sLog.outErrorDb("ERROR: Some waypoint has textid%u with not existing %u text.", j, be->textid[j]); sLog.outErrorDb("Some waypoint has textid%u with not existing %u text.", j, be->textid[j]);
be->textid[j] = 0; be->textid[j] = 0;
++zeroCount; ++zeroCount;
continue; continue;

2
src/game/debugcmds.cpp
View file

@ -564,7 +564,7 @@ bool ChatHandler::HandleDebugSpawnVehicle(const char* args)
if(!v->IsPositionValid()) if(!v->IsPositionValid())
{ {
sLog.outError("ERROR: Vehicle (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)", sLog.outError("Vehicle (guidlow %d, entry %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",
v->GetGUIDLow(), v->GetEntry(), v->GetPositionX(), v->GetPositionY()); v->GetGUIDLow(), v->GetEntry(), v->GetPositionX(), v->GetPositionY());
delete v; delete v;
return false; return false;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "7505" #define REVISION_NR "7506"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__