diff options
| author | QAston <none@none> | 2009-05-15 18:00:50 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-05-15 18:00:50 +0200 |
| commit | a796012723dd2410a150264a4f32f00bc570ef76 (patch) | |
| tree | d55cada7db3c9c752815c79d9d164069acd99edc /src/game/GameObject.cpp | |
| parent | ae461a4158d6376e28e7bc53d3f7ad5690a5064e (diff) | |
| parent | ad92f5e210b7a2c0584cdabd30560fe723d160be (diff) | |
*Merge some fixes from tc1
--HG--
branch : trunk
Diffstat (limited to 'src/game/GameObject.cpp')
| -rw-r--r-- | src/game/GameObject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index 2f1014eb769..540ea1e0dd7 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -174,7 +174,7 @@ bool GameObject::Create(uint32 guidlow, uint32 name_id, Map *map, uint32 phaseMa //Normally non-players do not teleport to other maps. if(map->IsDungeon() && ((InstanceMap*)map)->GetInstanceData()) { - ((InstanceMap*)map)->GetInstanceData()->OnObjectCreate(this); + ((InstanceMap*)map)->GetInstanceData()->OnObjectCreate(this, true); } return true; @@ -198,7 +198,7 @@ void GameObject::Update(uint32 /*p_time*/) { // Arming Time for GAMEOBJECT_TYPE_TRAP (6) Unit* owner = GetOwner(); - if (owner && ((Player*)owner)->isInCombat()) + if (owner && owner->isInCombat()) m_cooldownTime = time(NULL) + GetGOInfo()->trap.startDelay; m_lootState = GO_READY; break; |