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

*Make sure the a player can only have one viewpoint.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-24 13:13:00 -06:00
parent 6b4d5c4a35
commit c5969d6d03
5 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Player.cpp
+29 -24
View File
@@ -1901,10 +1901,10 @@ void Player::RemoveFromWorld()
if(m_uint32Values)
{
if(GetUInt64Value(PLAYER_FARSIGHT))
if(WorldObject *viewpoint = GetViewpoint())
{
sLog.outCrash("Player %s has viewpoint when removed from world", GetName());
CreateViewpoint(NULL);
sLog.outCrash("Player %s has viewpoint %u %u when removed from world", GetName(), viewpoint->GetEntry(), viewpoint->GetTypeId());
SetViewpoint(viewpoint, false);
}
}
}
@@ -20088,16 +20088,33 @@ void Player::StopCastingBindSight()
}
}
void Player::CreateViewpoint(WorldObject* target)
void Player::SetViewpoint(WorldObject* target, bool apply)
{
if(!target || target == this) // remove viewpoint
if(apply)
{
sLog.outDebug("Player::CreateViewpoint: Player %s create seer %u (TypeId: %u).", GetName(), target->GetEntry(), target->GetTypeId());
if(!AddUInt64Value(PLAYER_FARSIGHT, target->GetGUID()))
{
sLog.outCrash("Player::CreateViewpoint: Player %s cannot add new viewpoint!", GetName());
return;
}
if(target->isType(TYPEMASK_UNIT))
((Unit*)target)->AddPlayerToVision(this);
}
else
{
sLog.outDebug("Player::CreateViewpoint: Player %s remove seer", GetName());
if(WorldObject *viewpoint = GetViewpoint())
if(viewpoint->isType(TYPEMASK_UNIT))
((Unit*)viewpoint)->RemovePlayerFromVision(this);
SetUInt64Value(PLAYER_FARSIGHT, 0);
if(!RemoveUInt64Value(PLAYER_FARSIGHT, target->GetGUID()))
{
sLog.outCrash("Player::CreateViewpoint: Player %s cannot remove current viewpoint!", GetName());
return;
}
if(target->isType(TYPEMASK_UNIT))
((Unit*)target)->RemovePlayerFromVision(this);
//must immediately set seer back otherwise may crash
m_seer = this;
@@ -20105,20 +20122,6 @@ void Player::CreateViewpoint(WorldObject* target)
//WorldPacket data(SMSG_CLEAR_FAR_SIGHT_IMMEDIATE, 0);
//GetSession()->SendPacket(&data);
}
else
{
sLog.outDebug("Player::CreateViewpoint: Player %s create seer %u (TypeId: %u).", GetName(), target->GetEntry(), target->GetTypeId());
StopCastingBindSight();
if(!AddUInt64Value(PLAYER_FARSIGHT, target->GetGUID()))
{
sLog.outError("Player::CreateViewpoint: Player %s cannot remove current viewpoint!", GetName());
return;
}
if(target->isType(TYPEMASK_UNIT))
((Unit*)target)->AddPlayerToVision(this);
}
}
WorldObject* Player::GetViewpoint() const
@@ -20224,7 +20227,8 @@ void Player::EnterVehicle(Vehicle *vehicle)
StopCastingCharm();
StopCastingBindSight();
SetCharm(vehicle, true); // charm
SetCharm(vehicle, true);
SetViewpoint(vehicle, true);
SetMover(vehicle);
SetClientControl(vehicle, 1); // redirect controls to vehicle
@@ -20264,6 +20268,7 @@ void Player::ExitVehicle(Vehicle *vehicle)
vehicle->setFaction((GetTeam() == ALLIANCE) ? vehicle->GetCreatureInfo()->faction_A : vehicle->GetCreatureInfo()->faction_H);
SetCharm(vehicle, false);
SetViewpoint(vehicle, false);
SetMover(this);
SetClientControl(vehicle, 0);