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

Fix some code porting discrepancies

Browse source
This commit is contained in:
Antz 2016-09-16 11:12:41 +01:00 • committed by Antz
parent f0febf526b
commit 00983174a5
19 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/Object/Unit.cpp
View file

@ -491,10 +491,10 @@ void GlobalCooldownMgr::CancelGlobalCooldown(SpellEntry const* spellInfo)
Unit::Unit() :
movespline(new Movement::MoveSpline()),
m_charmInfo(nullptr),
m_charmInfo(NULL),
i_motionMaster(this),
m_regenTimer(0),
m_vehicleInfo(nullptr),
m_vehicleInfo(NULL),
m_ThreatManager(this),
m_HostileRefManager(this)
{
@ -12450,7 +12450,7 @@ void Unit::ResetControlState(bool attackCharmer /*= true*/)
{
player->GetCamera().ResetView();
player->SetClientControl(player, 1);
player->SetMover(nullptr);
player->SetMover(NULL);
}
return;
}
@ -12465,7 +12465,7 @@ void Unit::ResetControlState(bool attackCharmer /*= true*/)
if (player)
{
player->SetClientControl(possessed, 0);
player->SetMover(nullptr);
player->SetMover(NULL);
player->GetCamera().ResetView();
if (possessedCreature->IsPet() && possessedCreature->GetObjectGuid() == GetPetGuid())