From 6592e99f4aa8972452ee5fd426893f2cf832e291 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sat, 9 May 2009 10:48:14 -0500
Subject: *Some update of spell target selection.

--HG--
branch : trunk
---
 src/game/GameObject.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/game/GameObject.cpp')

diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index 2f1014eb769..1a2ed5fb6db 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -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;
-- 
cgit v1.2.3


From 08a0c543d1bde434a2d994ae3ab71035343c8039 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sat, 9 May 2009 14:08:11 -0500
Subject: *Fix some typos of script functions.

--HG--
branch : trunk
---
 src/game/CreatureAI.cpp | 4 ++--
 src/game/GameObject.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/game/GameObject.cpp')

diff --git a/src/game/CreatureAI.cpp b/src/game/CreatureAI.cpp
index 5fd35150b52..5cde80aaccb 100644
--- a/src/game/CreatureAI.cpp
+++ b/src/game/CreatureAI.cpp
@@ -86,14 +86,14 @@ void CreatureAI::DoZoneInCombat(Creature* creature)
     if(!creature->getVictim())
     {
         if(Unit *target = creature->SelectNearestTarget())
-            AttackStart(target);
+            creature->AI()->AttackStart(target);
         else if(creature->isSummon())
         {
             if(Unit *summoner = ((TempSummon*)creature)->GetSummoner())
             {
                 if(summoner->getVictim()
                     && (creature->IsFriendlyTo(summoner) || creature->IsHostileTo(summoner->getVictim())))
-                    AttackStart(summoner->getVictim());
+                    creature->AI()->AttackStart(summoner->getVictim());
             }
         }
     }
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index 1a2ed5fb6db..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;
-- 
cgit v1.2.3