Changeset 257 for trunk/src/bindings

Timestamp:

11/19/08 13:51:33 (17 years ago)

Author:

yumileroy

Message:

*Merge from Mangos. Add MapReference?. Author: hunuza.
*Also re-commit the patches reverted in 255.

Original author: megamage
Date: 2008-11-18 19:40:06-06:00

Location:

trunk/src/bindings/scripts

Files:

• include/sc_creature.cpp (modified) (2 diffs)
• include/sc_creature.h (modified) (1 diff)
• scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp (modified) (1 diff)
• scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp (modified) (1 diff)
• scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp (modified) (1 diff)
• scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp (modified) (13 diffs)
• scripts/zone/karazhan/karazhan.cpp (modified) (1 diff)
• scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp (modified) (3 diffs)
• scripts/zone/sunwell_plateau/boss_felmyst.cpp (modified) (5 diffs)
• scripts/zone/sunwell_plateau/boss_kalecgos.cpp (modified) (1 diff)
• scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp (modified) (1 diff)
• scripts/zone/zulaman/boss_hexlord.cpp (modified) (2 diffs)
• scripts/zone/zulaman/boss_janalai.cpp (modified) (1 diff)
• scripts/zone/zulaman/instance_zulaman.cpp (modified) (1 diff)

trunk/src/bindings/scripts/include/sc_creature.cpp

@@ -680 +680 @@
     }
 
-    InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)map)->GetPlayers();
-    InstanceMap::PlayerList::const_iterator i;
-    for (i = PlayerList.begin(); i != PlayerList.end(); ++i)
-    {
-        if((*i)->isAlive())
-            pUnit->AddThreat(*i, 0.0f);
-    }
+    Map::PlayerList const &PlayerList = map->GetPlayers();
+    for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
+        if (Player* i_pl = i->getSource())
+            if (!i_pl->isAlive())
+                pUnit->AddThreat(i_pl, 0.0f);
 }
 
@@ -721 +719 @@
     ((Player*)pUnit)->TeleportTo(pUnit->GetMapId(), x, y, z, o, TELE_TO_NOT_LEAVE_COMBAT);
 }
+
+void ScriptedAI::DoTeleportAll(float x, float y, float z, float o)
+{
+    Map *map = m_creature->GetMap();
+    if (!map->IsDungeon())
+        return;
+
+    Map::PlayerList const &PlayerList = map->GetPlayers();
+    for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
+        if (Player* i_pl = i->getSource())
+            if (!i_pl->isAlive())
+                i_pl->TeleportTo(m_creature->GetMapId(), x, y, z, o, TELE_TO_NOT_LEAVE_COMBAT);
+}
+
 
 Unit* ScriptedAI::DoSelectLowestHpFriendly(float range, uint32 MinHPDiff)

trunk/src/bindings/scripts/include/sc_creature.h

@@ -147 +147 @@
     //Teleports a player without dropping threat (only teleports to same map)
     void DoTeleportPlayer(Unit* pUnit, float x, float y, float z, float o);
+    void DoTeleportAll(float x, float y, float z, float o);
 
     //Returns friendly unit with the most amount of hp missing from max hp

trunk/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp

@@ -221 +221 @@
         if ( DrawnShadows_Timer < diff)
         {
-            Map *map = m_creature->GetMap();
-            if(map->IsDungeon())
-            {
-                InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)map)->GetPlayers();
-                for (InstanceMap::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
-                {
-                    if((*i)->isAlive())
-                    {
-                        (*i)->TeleportTo(555,VorpilPosition[0][0],VorpilPosition[0][1],VorpilPosition[0][2],0);
-                    }
-                }
-            }
+            DoTeleportAll(VorpilPosition[0][0],VorpilPosition[0][1],VorpilPosition[0][2],0);
             m_creature->Relocate(VorpilPosition[0][0],VorpilPosition[0][1],VorpilPosition[0][2],0);
             DoCast(m_creature,SPELL_DRAWN_SHADOWS,true);

trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp

@@ -251 +251 @@
                         //remove old tainted cores to prevent cheating in phase 2
                         Map *map = m_creature->GetMap();
-                        InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)map)->GetPlayers();
-                        for(InstanceMap::PlayerList::const_iterator i = PlayerList.begin();i != PlayerList.end(); ++i)
-            {
-                if((*i))
+                        Map::PlayerList const &PlayerList = map->GetPlayers();
+                        for(Map::PlayerList::const_iterator i = PlayerList.begin();i != PlayerList.end(); ++i)
+            {
+                if(Player* i_pl = i->getSource())
                 {
-                    (*i)->DestroyItemCount(31088, 1, true);
+                    i_pl->DestroyItemCount(31088, 1, true);
                 }
             }

trunk/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp

@@ -755 +755 @@
                 {
                         Map *map = m_creature->GetMap();
-                        InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)map)->GetPlayers();
-                        for(InstanceMap::PlayerList::const_iterator itr = PlayerList.begin();itr != PlayerList.end(); ++itr)
+                        Map::PlayerList const &PlayerList = map->GetPlayers();
+                        for(Map::PlayerList::const_iterator itr = PlayerList.begin();itr != PlayerList.end(); ++itr)
             {
-                                bool isCasting = false;
-                                for(uint8 i = 0; i < CURRENT_MAX_SPELL; ++i)
-                                        if((*itr)->m_currentSpells[i])
-                                                isCasting = true;
-                                
-                                if(isCasting)
-                                {
-                                        DoCast((*itr), SPELL_EARTHSHOCK);
-                                        break;
-                                }
+                if (Player* i_pl = itr->getSource())
+                {
+                                    bool isCasting = false;
+                                    for(uint8 i = 0; i < CURRENT_MAX_SPELL; ++i)
+                                            if(i_pl->m_currentSpells[i])
+                                                    isCasting = true;
+                                
+                                    if(isCasting)
+                                    {
+                                            DoCast(i_pl, SPELL_EARTHSHOCK);
+                                            break;
+                                    }
+                }
                         }
                         Earthshock_Timer = 8000 + rand()%7000;

trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp

@@ -119 +119 @@
     void SetData(uint32 type, uint32 data)
     {
-        Player *player = GetPlayer();
-        if(!player) return;
-
         switch(type)
         {
@@ -130 +127 @@
             if(data != IN_PROGRESS)
             {
-                if(GameObject *Door = GameObject::GetGameObject(*player, DoorGUID))
+                if(GameObject *Door = instance->GetGameObjectInMap(DoorGUID))
                     Door->SetGoState(0);
             }
@@ -143 +140 @@
                     for(std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                     {
-                        if(Creature *Channeler = (Creature*)Unit::GetUnit(*player, *i))
+                        if(Creature *Channeler = instance->GetCreatureInMap(*i))
                         {
                             if(Channeler->isAlive())
@@ -152 +149 @@
                     }
                     CageTimer = 0;
-                    if(GameObject *Door = GameObject::GetGameObject(*player, DoorGUID))
+                    if(GameObject *Door = instance->GetGameObjectInMap(DoorGUID))
                         Door->SetGoState(0);
                 }break;
@@ -162 +159 @@
                     for(std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                     {
-                        Creature *Channeler = (Creature*)Unit::GetUnit(*player, *i);
+                        Creature *Channeler = instance->GetCreatureInMap(*i);
                         if(Channeler && Channeler->isAlive())
                         {
@@ -171 +168 @@
                     }
                     // Release Magtheridon after two minutes.
-                    Creature *Magtheridon = (Creature*)Unit::GetUnit(*player, MagtheridonGUID);
+                    Creature *Magtheridon = instance->GetCreatureInMap(MagtheridonGUID);
                     if(Magtheridon && Magtheridon->isAlive())
                     {
@@ -177 +174 @@
                         CageTimer = 120000;
                     }
-                    if(GameObject *Door = GameObject::GetGameObject(*player, DoorGUID))
+                    if(GameObject *Door = instance->GetGameObjectInMap(DoorGUID))
                         Door->SetGoState(1);
                 }break;
@@ -183 +180 @@
                 for(std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                 {
-                    Unit *Channeler = Unit::GetUnit(*player, *i);
+                    Creature *Channeler = instance->GetCreatureInMap(*i);
                     if(Channeler && Channeler->isAlive())
                     {
@@ -198 +195 @@
             for(std::set<uint64>::iterator i = ColumnGUID.begin(); i != ColumnGUID.end(); ++i)
             {
-                if(GameObject *Column = GameObject::GetGameObject(*player, *i))
+                if(GameObject *Column = instance->GetGameObjectInMap(*i))
                     Column->SetGoState(!data);
             }
@@ -214 +211 @@
     }
 
-    Player* GetPlayer()
-    {
-        if(((InstanceMap*)instance)->GetPlayers().size())
-            return ((InstanceMap*)instance)->GetPlayers().front();
-        return NULL;
-    }
-
     void AttackNearestTarget(Creature *creature)
     {
@@ -226 +216 @@
         float range;
         Player* target = NULL;
-        InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)instance)->GetPlayers();
-        InstanceMap::PlayerList::const_iterator i;
+        Map::PlayerList const &PlayerList = instance->GetPlayers();
+        Map::PlayerList::const_iterator i;
         for(i = PlayerList.begin(); i != PlayerList.end(); ++i)
         {
-            if((*i)->isTargetableForAttack())
-            {
-                range = (*i)->GetDistance(creature);
-                if(range < minRange)
-                {
-                    minRange = range;
-                    target = *i;
-                }                
+            if(Player* i_pl = i->getSource())
+            {
+                if(i_pl->isTargetableForAttack())
+                {
+                    range = i_pl->GetDistance(creature);
+                    if(range < minRange)
+                    {
+                        minRange = range;
+                        target = i_pl;
+                    }                
+                }
             }
         }
@@ -249 +242 @@
             if(CageTimer <= diff)
             {
-                if(Player *player = GetPlayer())
-                {
-                    Creature *Magtheridon = (Creature*)Unit::GetUnit(*player, MagtheridonGUID);
-                    if(Magtheridon && Magtheridon->isAlive())
-                    {
-                        Magtheridon->clearUnitState(UNIT_STAT_STUNNED);
-                        AttackNearestTarget(Magtheridon);
-                    }
+                Creature *Magtheridon = instance->GetCreatureInMap(MagtheridonGUID);
+                if(Magtheridon && Magtheridon->isAlive())
+                {
+                    Magtheridon->clearUnitState(UNIT_STAT_STUNNED);
+                    AttackNearestTarget(Magtheridon);
                 }
                 CageTimer = 0;
@@ -266 +256 @@
             if(RespawnTimer <= diff)
             {
-                if(Player *player = GetPlayer())
-                {
-                    for(std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
-                    {
-                        if(Creature *Channeler = (Creature*)Unit::GetUnit(*player, *i))
-                        {
-                            if(Channeler->isAlive())
-                                Channeler->AI()->EnterEvadeMode();
-                            else
-                                Channeler->Respawn();
-                        }
+                for(std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
+                {
+                    if(Creature *Channeler = instance->GetCreatureInMap(*i))
+                    {
+                        if(Channeler->isAlive())
+                            Channeler->AI()->EnterEvadeMode();
+                        else
+                            Channeler->Respawn();
                     }
                 }

trunk/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp

@@ -286 +286 @@
                     if(!map->IsDungeon()) return;
 
-                    InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)map)->GetPlayers();
-                    if(PlayerList.empty())
+                    Map::PlayerList const &PlayerList = map->GetPlayers();
+                    if(PlayerList.isEmpty())
                         return;
 
                     RaidWiped = true;
-                    for(InstanceMap::PlayerList::const_iterator i = PlayerList.begin();i != PlayerList.end(); ++i)
+                    for(Map::PlayerList::const_iterator i = PlayerList.begin();i != PlayerList.end(); ++i)
                     {
-                        if((*i)->isAlive() && !(*i)->isGameMaster())
+                        if (i->getSource()->isAlive() && !i->getSource()->isGameMaster())
                         {
                             RaidWiped = false;

trunk/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp

@@ -232 +232 @@
         m_creature->Relocate(KaelLocations[0][0], KaelLocations[0][1], LOCATION_Z, 0);
                 Map *map = m_creature->GetMap();
-        InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)map)->GetPlayers();
-                InstanceMap::PlayerList::const_iterator i;
+        Map::PlayerList const &PlayerList = map->GetPlayers();
+                Map::PlayerList::const_iterator i;
                 for (i = PlayerList.begin(); i != PlayerList.end(); ++i)
                 {
-                        //if(!(*i)->isGameMaster())
-                        if((*i) && (*i)->isAlive())
-                        {
-                                (*i)->CastSpell((*i), SPELL_TELEPORT_CENTER, true);
-                                m_creature->GetNearPoint(m_creature,x,y,z,5,5,0);
-                                (*i)->TeleportTo(m_creature->GetMapId(),x,y,LOCATION_Z,(*i)->GetOrientation());
-                        }
+                        if (Player* i_pl = i->getSource())
+                            if(i_pl->isAlive())
+                            {
+                                    i_pl->CastSpell(i_pl, SPELL_TELEPORT_CENTER, true);
+                                    m_creature->GetNearPoint(m_creature,x,y,z,5,5,0);
+                                    i_pl->TeleportTo(m_creature->GetMapId(),x,y,LOCATION_Z,i_pl->GetOrientation());
+                            }
         }
         DoCast(m_creature, SPELL_TELEPORT_CENTER, true);
@@ -250 +250 @@
     {
                 Map *map = m_creature->GetMap();
-        InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)map)->GetPlayers();
-                InstanceMap::PlayerList::const_iterator i;
+        Map::PlayerList const &PlayerList = map->GetPlayers();
+                Map::PlayerList::const_iterator i;
                 for (i = PlayerList.begin(); i != PlayerList.end(); ++i)
-                {            
-                        if((*i) && (*i)->isAlive())
+                {
+            if (Player* i_pl = i->getSource())
+                            if(i_pl->isAlive())
                 // Knockback into the air
-                (*i)->CastSpell((*i), SPELL_GRAVITY_LAPSE_DOT, true, 0, 0, m_creature->GetGUID());
+                    i_pl->CastSpell(i_pl, SPELL_GRAVITY_LAPSE_DOT, true, 0, 0, m_creature->GetGUID());
         }
     }
@@ -263 +264 @@
     {
                 Map *map = m_creature->GetMap();
-                InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)map)->GetPlayers();
-                InstanceMap::PlayerList::const_iterator i;
+                Map::PlayerList const &PlayerList = map->GetPlayers();
+                Map::PlayerList::const_iterator i;
+                for (i = PlayerList.begin(); i != PlayerList.end(); ++i)
+                {
+            if (Player* i_pl = i->getSource())
+            {
+                            if(i_pl->isAlive())
+                {
+                    // Also needs an exception in spell system.
+                    i_pl->CastSpell(i_pl, SPELL_GRAVITY_LAPSE_FLY, true, 0, 0, m_creature->GetGUID());
+                    // Use packet hack
+                    WorldPacket data(12);
+                    data.SetOpcode(SMSG_MOVE_SET_CAN_FLY);
+                    data.append(i_pl->GetPackGUID());
+                    data << uint32(0);
+                    i_pl->SendMessageToSet(&data, true);
+                                    i_pl->SetSpeed(MOVE_FLY, 2.0f);
+                }
+            }
+        }
+    }
+
+    void RemoveGravityLapse()
+    {
+                Map *map = m_creature->GetMap();
+        Map::PlayerList const &PlayerList = map->GetPlayers();
+                Map::PlayerList::const_iterator i;
                 for (i = PlayerList.begin(); i != PlayerList.end(); ++i)
                 { 
-                        if((*i) && (*i)->isAlive())
+            if(Player* i_pl = i->getSource())
             {
-                // Also needs an exception in spell system.
-                (*i)->CastSpell((*i), SPELL_GRAVITY_LAPSE_FLY, true, 0, 0, m_creature->GetGUID());
-                // Use packet hack
-                WorldPacket data(12);
-                data.SetOpcode(SMSG_MOVE_SET_CAN_FLY);
-                data.append((*i)->GetPackGUID());
-                data << uint32(0);
-                (*i)->SendMessageToSet(&data, true);
-                                (*i)->SetSpeed(MOVE_FLY, 2.0f);
-            }
-        }
-    }
-
-    void RemoveGravityLapse()
-    {
-                Map *map = m_creature->GetMap();
-        InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)map)->GetPlayers();
-                InstanceMap::PlayerList::const_iterator i;
-                for (i = PlayerList.begin(); i != PlayerList.end(); ++i)
-                { 
-            if((*i))
-            {
-                (*i)->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_FLY);
-                (*i)->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_DOT);
+                i_pl->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_FLY);
+                i_pl->RemoveAurasDueToSpell(SPELL_GRAVITY_LAPSE_DOT);
                 WorldPacket data(12);
                 data.SetOpcode(SMSG_MOVE_UNSET_CAN_FLY);
-                data.append((*i)->GetPackGUID());
+                data.append(i_pl->GetPackGUID());
                 data << uint32(0);
-                (*i)->SendMessageToSet(&data, true);
+                i_pl->SendMessageToSet(&data, true);
             }
         }

trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp

@@ -296 +296 @@
             break;
         case 2:
-            if(Player* target = SelectRandomPlayer(150))
+            if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0, 150, true))
             {
                 Creature* Vapor = m_creature->SummonCreature(MOB_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000);
@@ -312 +312 @@
             DespawnSummons(MOB_VAPOR_TRAIL);
             //m_creature->CastSpell(m_creature, SPELL_VAPOR_SELECT); need core support
-            if(Player* target = SelectRandomPlayer(150))
+            if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0, 150, true))
             {
                 //target->CastSpell(target, SPELL_VAPOR_SUMMON, true); need core support
@@ -331 +331 @@
             break;
         case 5:
-            if(Player* target = SelectRandomPlayer(150))
+            if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0, 150, true))
             {
                 BreathX = target->GetPositionX();
@@ -434 +434 @@
                 break;
             case EVENT_ENCAPSULATE:
-                if(Unit* target = SelectRandomPlayer(150))
+                if(Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0, 150, true))
                 {
                     m_creature->CastSpell(target, SPELL_ENCAPSULATE_CHANNEL, false);
@@ -516 +516 @@
         }
     }
-
-    Player* SelectRandomPlayer(float range = 0.0f)
-    {
-        Map *map = m_creature->GetMap();
-        if (!map->IsDungeon()) return NULL;
-
-        InstanceMap::PlayerList PlayerList = ((InstanceMap*)map)->GetPlayers();
-        InstanceMap::PlayerList::iterator i;
-        while(PlayerList.size())
-        {
-            i = PlayerList.begin();
-            advance(i, rand()%PlayerList.size());
-            if((range == 0.0f || m_creature->IsWithinDistInMap(*i, range))
-                && (*i)->isTargetableForAttack())
-                return *i;
-            else
-                PlayerList.erase(i);
-        }
-        return NULL;
-    }
 };
 

trunk/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp

@@ -369 +369 @@
         Map *map = m_creature->GetMap();
         if(!map->IsDungeon()) return;
-        InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)map)->GetPlayers();
-        InstanceMap::PlayerList::const_iterator i;
-        for (i = PlayerList.begin(); i != PlayerList.end(); ++i)
-        {
-            if((*i)->HasAura(AURA_SPECTRAL_REALM,0))
-                (*i)->RemoveAurasDueToSpell(AURA_SPECTRAL_REALM);
-        }
+        Map::PlayerList const &PlayerList = map->GetPlayers();
+        Map::PlayerList::const_iterator i;
+        for(i = PlayerList.begin(); i != PlayerList.end(); ++i)
+            if(Player* i_pl = i->getSource())
+                if(i_pl->HasAura(AURA_SPECTRAL_REALM,0))
+                    i_pl->RemoveAurasDueToSpell(AURA_SPECTRAL_REALM);
     }
 

trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp

@@ -578 +578 @@
                 if(!map->IsDungeon()) return;
 
-                InstanceMap::PlayerList const &PlayerList = ((InstanceMap*)map)->GetPlayers();
-                for (InstanceMap::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
-                {
-                    //Play random sound to the zone
-                    switch (rand()%8)
+                Map::PlayerList const &PlayerList = map->GetPlayers();
+                for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
+                {
+                    if (Player* i_pl = i->getSource())
                     {
-                        case 0: (*i)->SendPlaySound(RND_WISPER_1, true); break;
-                        case 1: (*i)->SendPlaySound(RND_WISPER_2, true); break;
-                        case 2: (*i)->SendPlaySound(RND_WISPER_3, true); break;
-                        case 3: (*i)->SendPlaySound(RND_WISPER_4, true); break;
-                        case 4: (*i)->SendPlaySound(RND_WISPER_5, true); break;
-                        case 5: (*i)->SendPlaySound(RND_WISPER_6, true); break;
-                        case 6: (*i)->SendPlaySound(RND_WISPER_7, true); break;
-                        case 7: (*i)->SendPlaySound(RND_WISPER_8, true); break;
+                        //Play random sound to the zone
+                        switch (rand()%8)
+                        {
+                            case 0: i_pl->SendPlaySound(RND_WISPER_1, true); break;
+                            case 1: i_pl->SendPlaySound(RND_WISPER_2, true); break;
+                            case 2: i_pl->SendPlaySound(RND_WISPER_3, true); break;
+                            case 3: i_pl->SendPlaySound(RND_WISPER_4, true); break;
+                            case 4: i_pl->SendPlaySound(RND_WISPER_5, true); break;
+                            case 5: i_pl->SendPlaySound(RND_WISPER_6, true); break;
+                            case 6: i_pl->SendPlaySound(RND_WISPER_7, true); break;
+                            case 7: i_pl->SendPlaySound(RND_WISPER_8, true); break;
+                        }
                     }
                 }

trunk/src/bindings/scripts/scripts/zone/zulaman/boss_hexlord.cpp

@@ -372 +372 @@
         if(SiphonSoul_Timer < diff)
         {
-            Player* target = SelectRandomPlayer(50);
+            Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0, 70, true);
             Unit *trigger = DoSpawnCreature(MOB_TEMP_TRIGGER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 30000);
             if(!target || !trigger) EnterEvadeMode();
@@ -436 +436 @@
         m_creature->CastSpell(target, PlayerAbility[PlayerClass][random].spell, false);
     }
-
-    Player* SelectRandomPlayer(float range = 0.0f, bool alive = true)
-    {
-        Map *map = m_creature->GetMap();
-        if (!map->IsDungeon()) return NULL;
-
-        InstanceMap::PlayerList PlayerList = ((InstanceMap*)map)->GetPlayers();
-        InstanceMap::PlayerList::iterator i;
-        while(PlayerList.size())
-        {
-            i = PlayerList.begin();
-            advance(i, rand()%PlayerList.size());
-            if((range == 0.0f || m_creature->IsWithinDistInMap(*i, range))
-                && (!alive || (*i)->isAlive()))
-                return *i;
-            else
-                PlayerList.erase(i);
-        }
-        return NULL;
-    }
 };
 

trunk/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp

@@ -398 +398 @@
             Map *map = m_creature->GetMap();
             if(!map->IsDungeon()) return;
-            InstanceMap::PlayerList const &PlayerList =((InstanceMap*)map)->GetPlayers();
-            for(InstanceMap::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
-            {
-                if((*i)->isAlive())
-                    DoTeleportPlayer(*i, JanalainPos[0][0]-5+rand()%10, JanalainPos[0][1]-5+rand()%10, JanalainPos[0][2], 0);
+            Map::PlayerList const &PlayerList = map->GetPlayers();
+            for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
+            {
+                if (Player* i_pl = i->getSource())
+                    if(i_pl->isAlive())
+                        DoTeleportPlayer(i_pl, JanalainPos[0][0]-5+rand()%10, JanalainPos[0][1]-5+rand()%10, JanalainPos[0][2], 0);
             }
             //m_creature->CastSpell(Temp, SPELL_SUMMON_PLAYERS, true); // core bug, spell does not work if too far

trunk/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp

@@ -140 +140 @@
     void OpenDoor(uint64 DoorGUID, bool open)
     {
-        if(((InstanceMap*)instance)->GetPlayers().size())
-            if(Player* first = ((InstanceMap*)instance)->GetPlayers().front())
-                if(GameObject *Door = GameObject::GetGameObject(*first, DoorGUID))
-                    Door->SetUInt32Value(GAMEOBJECT_STATE, open ? 0 : 1);
+        if(GameObject *Door = instance->GetGameObjectInMap(DoorGUID))
+            Door->SetUInt32Value(GAMEOBJECT_STATE, open ? 0 : 1);
     }
 
     void SummonHostage(uint8 num)
     {
-        if(QuestMinute && ((InstanceMap*)instance)->GetPlayers().size())
-            if(Player* first = ((InstanceMap*)instance)->GetPlayers().front())
-                if(Unit* Hostage = first->SummonCreature(HostageInfo[num].npc, HostageInfo[num].x, HostageInfo[num].y, HostageInfo[num].z, HostageInfo[num].o, TEMPSUMMON_DEAD_DESPAWN, 0))
-                {
-                    Hostage->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-                    Hostage->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
-                }
+        if(!QuestMinute)
+            return;
+
+        Map::PlayerList const &PlayerList = instance->GetPlayers();
+        if (PlayerList.isEmpty())
+            return;
+
+        Map::PlayerList::const_iterator i = PlayerList.begin();
+        if(Player* i_pl = i->getSource())
+        {
+            if(Unit* Hostage = i_pl->SummonCreature(HostageInfo[num].npc, HostageInfo[num].x, HostageInfo[num].y, HostageInfo[num].z, HostageInfo[num].o, TEMPSUMMON_DEAD_DESPAWN, 0))
+            {
+                Hostage->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                Hostage->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            }
+        }
     }