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

[7424] Codestyle: removed not needed \n in log output. Author: balrok

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-09 17:56:51 -06:00
parent f4e473c877
commit 3d3656297f
11 changed files with 112 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Creature.cpp
+2 -2
View File
@@ -1721,7 +1721,7 @@ SpellEntry const *Creature::reachWithSpellAttack(Unit *pVictim)
SpellEntry const *spellInfo = sSpellStore.LookupEntry(m_spells[i] ); SpellEntry const *spellInfo = sSpellStore.LookupEntry(m_spells[i] );
if(!spellInfo) if(!spellInfo)
{ {
sLog.outError("WORLD: unknown spell id %i\n", m_spells[i]); sLog.outError("WORLD: unknown spell id %i", m_spells[i]);
continue; continue;
} }
@@ -1771,7 +1771,7 @@ SpellEntry const *Creature::reachWithSpellCure(Unit *pVictim)
SpellEntry const *spellInfo = sSpellStore.LookupEntry(m_spells[i] ); SpellEntry const *spellInfo = sSpellStore.LookupEntry(m_spells[i] );
if(!spellInfo) if(!spellInfo)
{ {
sLog.outError("WORLD: unknown spell id %i\n", m_spells[i]); sLog.outError("WORLD: unknown spell id %i", m_spells[i]);
continue; continue;
} }
src/game/Map.cpp
+1 -1
View File
@@ -2061,7 +2061,7 @@ void InstanceMap::PermBindAllPlayers(Player *player)
InstanceSave *save = sInstanceSaveManager.GetInstanceSave(GetInstanceId()); InstanceSave *save = sInstanceSaveManager.GetInstanceSave(GetInstanceId());
if(!save) if(!save)
{ {
sLog.outError("Cannot bind players, no instance save available for map!\n"); sLog.outError("Cannot bind players, no instance save available for map!");
return; return;
} }
src/game/ObjectAccessor.cpp
+1 -1
View File
@@ -410,7 +410,7 @@ ObjectAccessor::ConvertCorpseForPlayer(uint64 player_guid, bool insignia)
return NULL; return NULL;
} }
DEBUG_LOG("Deleting Corpse and spawning bones.\n"); DEBUG_LOG("Deleting Corpse and spawning bones.");
// remove corpse from player_guid -> corpse map // remove corpse from player_guid -> corpse map
RemoveCorpse(corpse); RemoveCorpse(corpse);
src/game/PetHandler.cpp
+16 -16
View File
@@ -46,16 +46,16 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
// used also for charmed creature // used also for charmed creature
Unit* pet= ObjectAccessor::GetUnit(*_player, guid1); Unit* pet= ObjectAccessor::GetUnit(*_player, guid1);
sLog.outDetail("HandlePetAction.Pet %u flag is %u, spellid is %u, target %u.\n", uint32(GUID_LOPART(guid1)), flag, spellid, uint32(GUID_LOPART(guid2)) ); sLog.outDetail("HandlePetAction.Pet %u flag is %u, spellid is %u, target %u.", uint32(GUID_LOPART(guid1)), flag, spellid, uint32(GUID_LOPART(guid2)) );
if(!pet) if(!pet)
{ {
sLog.outError( "Pet %u not exist.\n", uint32(GUID_LOPART(guid1)) ); sLog.outError( "Pet %u not exist.", uint32(GUID_LOPART(guid1)) );
return; return;
} }
if(pet != GetPlayer()->GetPet() && pet != GetPlayer()->GetCharm()) if(pet != GetPlayer()->GetPet() && pet != GetPlayer()->GetCharm())
{ {
sLog.outError("HandlePetAction.Pet %u isn't pet of player %s.\n", uint32(GUID_LOPART(guid1)), GetPlayer()->GetName() ); sLog.outError("HandlePetAction.Pet %u isn't pet of player %s.", uint32(GUID_LOPART(guid1)), GetPlayer()->GetName() );
return; return;
} }
@@ -159,7 +159,7 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
_player->Uncharm(); _player->Uncharm();
break; break;
default: default:
sLog.outError("WORLD: unknown PET flag Action %i and spellid %i.\n", flag, spellid); sLog.outError("WORLD: unknown PET flag Action %i and spellid %i.", flag, spellid);
} }
break; break;
case ACT_REACTION: // 0x600 case ACT_REACTION: // 0x600
@@ -188,7 +188,7 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid ); SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid );
if(!spellInfo) if(!spellInfo)
{ {
sLog.outError("WORLD: unknown PET spell id %i\n", spellid); sLog.outError("WORLD: unknown PET spell id %i", spellid);
return; return;
} }
@@ -278,7 +278,7 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
break; break;
} }
default: default:
sLog.outError("WORLD: unknown PET flag Action %i and spellid %i.\n", flag, spellid); sLog.outError("WORLD: unknown PET flag Action %i and spellid %i.", flag, spellid);
} }
} }
@@ -286,7 +286,7 @@ void WorldSession::HandlePetNameQuery( WorldPacket & recv_data )
{ {
CHECK_PACKET_SIZE(recv_data,4+8); CHECK_PACKET_SIZE(recv_data,4+8);
sLog.outDetail( "HandlePetNameQuery. CMSG_PET_NAME_QUERY\n" ); sLog.outDetail( "HandlePetNameQuery. CMSG_PET_NAME_QUERY" );
uint32 petnumber; uint32 petnumber;
uint64 petguid; uint64 petguid;
@@ -326,7 +326,7 @@ void WorldSession::HandlePetSetAction( WorldPacket & recv_data )
{ {
CHECK_PACKET_SIZE(recv_data, 8+4+2+2); CHECK_PACKET_SIZE(recv_data, 8+4+2+2);
sLog.outDetail( "HandlePetSetAction. CMSG_PET_SET_ACTION\n" ); sLog.outDetail( "HandlePetSetAction. CMSG_PET_SET_ACTION" );
uint64 petguid; uint64 petguid;
uint32 position; uint32 position;
@@ -345,7 +345,7 @@ void WorldSession::HandlePetSetAction( WorldPacket & recv_data )
if(!pet || (pet != _player->GetPet() && pet != _player->GetCharm())) if(!pet || (pet != _player->GetPet() && pet != _player->GetCharm()))
{ {
sLog.outError( "HandlePetSetAction: Unknown pet or pet owner.\n" ); sLog.outError( "HandlePetSetAction: Unknown pet or pet owner." );
return; return;
} }
@@ -363,7 +363,7 @@ void WorldSession::HandlePetSetAction( WorldPacket & recv_data )
recv_data >> spell_id; recv_data >> spell_id;
recv_data >> act_state; recv_data >> act_state;
sLog.outDetail( "Player %s has changed pet spell action. Position: %u, Spell: %u, State: 0x%X\n", _player->GetName(), position, spell_id, act_state); sLog.outDetail( "Player %s has changed pet spell action. Position: %u, Spell: %u, State: 0x%X", _player->GetName(), position, spell_id, act_state);
//if it's act for spell (en/disable/cast) and there is a spell given (0 = remove spell) which pet doesn't know, don't add //if it's act for spell (en/disable/cast) and there is a spell given (0 = remove spell) which pet doesn't know, don't add
if(!((act_state == ACT_ENABLED || act_state == ACT_DISABLED || act_state == ACT_PASSIVE) && spell_id && !pet->HasSpell(spell_id))) if(!((act_state == ACT_ENABLED || act_state == ACT_DISABLED || act_state == ACT_PASSIVE) && spell_id && !pet->HasSpell(spell_id)))
@@ -395,7 +395,7 @@ void WorldSession::HandlePetRename( WorldPacket & recv_data )
{ {
CHECK_PACKET_SIZE(recv_data, 8+1); CHECK_PACKET_SIZE(recv_data, 8+1);
sLog.outDetail( "HandlePetRename. CMSG_PET_RENAME\n" ); sLog.outDetail( "HandlePetRename. CMSG_PET_RENAME" );
uint64 petguid; uint64 petguid;
uint8 isdeclined; uint8 isdeclined;
@@ -511,7 +511,7 @@ void WorldSession::HandlePetUnlearnOpcode(WorldPacket& recvPacket)
if(guid != pet->GetGUID()) if(guid != pet->GetGUID())
{ {
sLog.outError( "HandlePetUnlearnOpcode.Pet %u isn't pet of player %s .\n", uint32(GUID_LOPART(guid)),GetPlayer()->GetName() ); sLog.outError( "HandlePetUnlearnOpcode.Pet %u isn't pet of player %s .", uint32(GUID_LOPART(guid)),GetPlayer()->GetName() );
return; return;
} }
@@ -545,7 +545,7 @@ void WorldSession::HandlePetSpellAutocastOpcode( WorldPacket& recvPacket )
if(!pet || (pet != _player->GetPet() && pet != _player->GetCharm())) if(!pet || (pet != _player->GetPet() && pet != _player->GetCharm()))
{ {
sLog.outError( "HandlePetSpellAutocastOpcode.Pet %u isn't pet of player %s .\n", uint32(GUID_LOPART(guid)),GetPlayer()->GetName() ); sLog.outError( "HandlePetSpellAutocastOpcode.Pet %u isn't pet of player %s .", uint32(GUID_LOPART(guid)),GetPlayer()->GetName() );
return; return;
} }
@@ -595,7 +595,7 @@ void WorldSession::HandlePetCastSpellOpcode( WorldPacket& recvPacket )
if(!caster || (caster != _player->GetPet() && caster != _player->GetCharm())) if(!caster || (caster != _player->GetPet() && caster != _player->GetCharm()))
{ {
sLog.outError( "HandlePetCastSpellOpcode: Pet %u isn't pet of player %s .\n", uint32(GUID_LOPART(guid)),GetPlayer()->GetName() ); sLog.outError( "HandlePetCastSpellOpcode: Pet %u isn't pet of player %s .", uint32(GUID_LOPART(guid)),GetPlayer()->GetName() );
return; return;
} }
@@ -605,7 +605,7 @@ void WorldSession::HandlePetCastSpellOpcode( WorldPacket& recvPacket )
SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid); SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid);
if(!spellInfo) if(!spellInfo)
{ {
sLog.outError("WORLD: unknown PET spell id %i\n", spellid); sLog.outError("WORLD: unknown PET spell id %i", spellid);
return; return;
} }
@@ -803,5 +803,5 @@ void WorldSession::HandlePetLearnTalent( WorldPacket & recv_data )
// learn! (other talent ranks will unlearned at learning) // learn! (other talent ranks will unlearned at learning)
pet->learnSpell(spellid); pet->learnSpell(spellid);
sLog.outDetail("TalentID: %u Rank: %u Spell: %u\n", talent_id, requested_rank, spellid); sLog.outDetail("TalentID: %u Rank: %u Spell: %u", talent_id, requested_rank, spellid);
} }
src/game/Player.cpp
+1 -1
View File
@@ -16115,7 +16115,7 @@ bool Player::_LoadHomeBind(QueryResult *result)
CharacterDatabase.PExecute("INSERT INTO character_homebind (guid,map,zone,position_x,position_y,position_z) VALUES ('%u', '%u', '%u', '%f', '%f', '%f')", GetGUIDLow(), m_homebindMapId, (uint32)m_homebindZoneId, m_homebindX, m_homebindY, m_homebindZ); CharacterDatabase.PExecute("INSERT INTO character_homebind (guid,map,zone,position_x,position_y,position_z) VALUES ('%u', '%u', '%u', '%f', '%f', '%f')", GetGUIDLow(), m_homebindMapId, (uint32)m_homebindZoneId, m_homebindX, m_homebindY, m_homebindZ);
} }
DEBUG_LOG("Setting player home position: mapid is: %u, zoneid is %u, X is %f, Y is %f, Z is %f\n", DEBUG_LOG("Setting player home position: mapid is: %u, zoneid is %u, X is %f, Y is %f, Z is %f",
m_homebindMapId, m_homebindZoneId, m_homebindX, m_homebindY, m_homebindZ); m_homebindMapId, m_homebindZoneId, m_homebindX, m_homebindY, m_homebindZ);
return true; return true;
src/game/SkillHandler.cpp
+1 -1
View File
@@ -128,7 +128,7 @@ void WorldSession::HandleLearnTalentOpcode( WorldPacket & recv_data )
// learn! (other talent ranks will unlearned at learning) // learn! (other talent ranks will unlearned at learning)
GetPlayer( )->learnSpell(spellid,false); GetPlayer( )->learnSpell(spellid,false);
sLog.outDetail("TalentID: %u Rank: %u Spell: %u\n", talent_id, requested_rank, spellid); sLog.outDetail("TalentID: %u Rank: %u Spell: %u", talent_id, requested_rank, spellid);
// update free talent points // update free talent points
GetPlayer()->SetFreeTalentPoints(CurTalentPoints - 1); GetPlayer()->SetFreeTalentPoints(CurTalentPoints - 1);
src/game/Spell.cpp
+1 -1
View File
@@ -3483,7 +3483,7 @@ void Spell::HandleEffects(Unit *pUnitTarget,Item *pItemTarget,GameObject *pGOTar
EffectEnchantItemTmp(i); EffectEnchantItemTmp(i);
else else
{ {
sLog.outError("SPELL: unknown effect %u spell id %u\n", sLog.outError("SPELL: unknown effect %u spell id %u",
eff, m_spellInfo->Id); eff, m_spellInfo->Id);
} }
} }
src/game/SpellEffects.cpp
+85 -4
View File
@@ -929,7 +929,7 @@ void Spell::EffectDummy(uint32 i)
return; return;
GameObject* Crystal_Prison = m_caster->SummonGameObject(179644, creatureTarget->GetPositionX(), creatureTarget->GetPositionY(), creatureTarget->GetPositionZ(), creatureTarget->GetOrientation(), 0, 0, 0, 0, creatureTarget->GetRespawnTime()-time(NULL)); GameObject* Crystal_Prison = m_caster->SummonGameObject(179644, creatureTarget->GetPositionX(), creatureTarget->GetPositionY(), creatureTarget->GetPositionZ(), creatureTarget->GetOrientation(), 0, 0, 0, 0, creatureTarget->GetRespawnTime()-time(NULL));
sLog.outDebug("SummonGameObject at SpellEfects.cpp EffectDummy for Spell 23019\n"); sLog.outDebug("SummonGameObject at SpellEfects.cpp EffectDummy for Spell 23019");
creatureTarget->setDeathState(JUST_DIED); creatureTarget->setDeathState(JUST_DIED);
creatureTarget->RemoveCorpse(); creatureTarget->RemoveCorpse();
@@ -1772,7 +1772,7 @@ void Spell::EffectDummy(uint32 i)
if(!spellInfo) if(!spellInfo)
{ {
sLog.outError("WORLD: unknown spell id %i\n", spell_id); sLog.outError("WORLD: unknown spell id %i", spell_id);
return; return;
} }
@@ -1919,7 +1919,7 @@ void Spell::EffectTriggerSpellWithValue(uint32 i)
if(!spellInfo) if(!spellInfo)
{ {
sLog.outError("EffectTriggerSpellWithValue of spell %u: triggering unknown spell id %i\n", m_spellInfo->Id,triggered_spell_id); sLog.outError("EffectTriggerSpellWithValue of spell %u: triggering unknown spell id %i", m_spellInfo->Id,triggered_spell_id);
return; return;
} }
@@ -2168,6 +2168,7 @@ void Spell::EffectTeleportUnits(uint32 i)
// If not exist data for dest location - return // If not exist data for dest location - return
if(!m_targets.HasDest()) if(!m_targets.HasDest())
{ {
<<<<<<< HEAD:src/game/SpellEffects.cpp
sLog.outError( "Spell::EffectTeleportUnits - does not have destination for spell ID %u\n", m_spellInfo->Id ); sLog.outError( "Spell::EffectTeleportUnits - does not have destination for spell ID %u\n", m_spellInfo->Id );
return; return;
} }
@@ -2188,6 +2189,86 @@ void Spell::EffectTeleportUnits(uint32 i)
WorldPacket data; WorldPacket data;
unitTarget->BuildTeleportAckMsg(&data, x, y, z, orientation); unitTarget->BuildTeleportAckMsg(&data, x, y, z, orientation);
unitTarget->SendMessageToSet(&data, false); unitTarget->SendMessageToSet(&data, false);
=======
case TARGET_INNKEEPER_COORDINATES:
{
// Only players can teleport to innkeeper
if (unitTarget->GetTypeId() != TYPEID_PLAYER)
return;
((Player*)unitTarget)->TeleportTo(((Player*)unitTarget)->m_homebindMapId,((Player*)unitTarget)->m_homebindX,((Player*)unitTarget)->m_homebindY,((Player*)unitTarget)->m_homebindZ,unitTarget->GetOrientation(),unitTarget==m_caster ? TELE_TO_SPELL : 0);
return;
}
case TARGET_TABLE_X_Y_Z_COORDINATES:
{
// TODO: Only players can teleport?
if (unitTarget->GetTypeId() != TYPEID_PLAYER)
return;
SpellTargetPosition const* st = spellmgr.GetSpellTargetPosition(m_spellInfo->Id);
if(!st)
{
sLog.outError( "Spell::EffectTeleportUnits - unknown Teleport coordinates for spell ID %u", m_spellInfo->Id );
return;
}
((Player*)unitTarget)->TeleportTo(st->target_mapId,st->target_X,st->target_Y,st->target_Z,st->target_Orientation,unitTarget==m_caster ? TELE_TO_SPELL : 0);
break;
}
case TARGET_BEHIND_VICTIM:
{
// Get selected target for player (or victim for units)
Unit *pTarget = NULL;
if(m_caster->GetTypeId() == TYPEID_PLAYER)
pTarget = ObjectAccessor::GetUnit(*m_caster, ((Player*)m_caster)->GetSelection());
else
pTarget = m_caster->getVictim();
// No target present - return
if (!pTarget)
return;
// Init dest coordinates
uint32 mapid = m_caster->GetMapId();
float x = m_targets.m_destX;
float y = m_targets.m_destY;
float z = m_targets.m_destZ;
float orientation = pTarget->GetOrientation();
// Teleport
if(unitTarget->GetTypeId() == TYPEID_PLAYER)
((Player*)unitTarget)->TeleportTo(mapid, x, y, z, orientation, TELE_TO_NOT_LEAVE_COMBAT | TELE_TO_NOT_UNSUMMON_PET | (unitTarget==m_caster ? TELE_TO_SPELL : 0));
else
{
m_caster->GetMap()->CreatureRelocation((Creature*)unitTarget, x, y, z, orientation);
WorldPacket data;
unitTarget->BuildTeleportAckMsg(&data, x, y, z, orientation);
unitTarget->SendMessageToSet(&data, false);
}
return;
}
default:
{
// If not exist data for dest location - return
if(!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION))
{
sLog.outError( "Spell::EffectTeleportUnits - unknown EffectImplicitTargetB[%u] = %u for spell ID %u", i, m_spellInfo->EffectImplicitTargetB[i], m_spellInfo->Id );
return;
}
// Init dest coordinates
uint32 mapid = m_caster->GetMapId();
float x = m_targets.m_destX;
float y = m_targets.m_destY;
float z = m_targets.m_destZ;
float orientation = unitTarget->GetOrientation();
// Teleport
if(unitTarget->GetTypeId() == TYPEID_PLAYER)
((Player*)unitTarget)->TeleportTo(mapid, x, y, z, orientation, TELE_TO_NOT_LEAVE_COMBAT | TELE_TO_NOT_UNSUMMON_PET | (unitTarget==m_caster ? TELE_TO_SPELL : 0));
else
{
m_caster->GetMap()->CreatureRelocation((Creature*)unitTarget, x, y, z, orientation);
WorldPacket data;
unitTarget->BuildTeleportAckMsg(&data, x, y, z, orientation);
unitTarget->SendMessageToSet(&data, false);
}
return;
}
>>>>>>> 49353326cacc281efc169f4e4e8ccb517157ff23:src/game/SpellEffects.cpp
} }
// post effects for TARGET_TABLE_X_Y_Z_COORDINATES // post effects for TARGET_TABLE_X_Y_Z_COORDINATES
@@ -6485,7 +6566,7 @@ void Spell::EffectTransmitted(uint32 effIndex)
//pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel() ); //pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel() );
pGameObj->SetSpellId(m_spellInfo->Id); pGameObj->SetSpellId(m_spellInfo->Id);
DEBUG_LOG("AddObject at SpellEfects.cpp EffectTransmitted\n"); DEBUG_LOG("AddObject at SpellEfects.cpp EffectTransmitted");
//m_caster->AddGameObject(pGameObj); //m_caster->AddGameObject(pGameObj);
//m_ObjToDel.push_back(pGameObj); //m_ObjToDel.push_back(pGameObj);
src/game/Unit.cpp
+1 -1
View File
@@ -1127,7 +1127,7 @@ void Unit::CastCustomSpell(Unit* Victim,uint32 spellId, int32 const* bp0, int32
if(!spellInfo) if(!spellInfo)
{ {
sLog.outError("CastCustomSpell: unknown spell id %i\n", spellId); sLog.outError("CastCustomSpell: unknown spell id %i", spellId);
return; return;
} }
src/game/WorldSocket.cpp
+1 -1
View File
@@ -317,7 +317,7 @@ int WorldSocket::handle_input (ACE_HANDLE)
} }
case 0: case 0:
{ {
DEBUG_LOG ("WorldSocket::handle_input: Peer has closed connection\n"); DEBUG_LOG ("WorldSocket::handle_input: Peer has closed connection");
errno = ECONNRESET; errno = ECONNRESET;
return -1; return -1;
src/shared/revision_nr.h
+1 -1
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 "7423" #define REVISION_NR "7424"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__