[Build] Most errors fixed

This commit is contained in:
Antz 2015-02-07 22:46:39 +00:00 committed by Antz
parent 868302dd0b
commit 778052084e
70 changed files with 619 additions and 602 deletions

View file

@ -242,7 +242,7 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
{
// Arming Time for GAMEOBJECT_TYPE_TRAP (6)
Unit* owner = GetOwner();
if (owner && owner->isInCombat())
if (owner && owner->IsInCombat())
m_cooldownTime = time(NULL) + GetGOInfo()->trap.startDelay;
m_lootState = GO_READY;
break;