Changeset 92

Timestamp:

11/19/08 13:34:48 (17 years ago)

Author:

yumileroy

Message:

[svn] Fixed win32 compile
Null pointer checks in the barrens ai.

Original author: w12x
Date: 2008-10-21 14:31:24-05:00

Files:

• trunk/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp (modified) (3 diffs)

trunk/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp

@@ -288 +288 @@
                     for(uint8 i = 0; i < 6; i++) {
                         Creature* pCreature = m_creature->SummonCreature(AFFRAY_CHALLENGER, AffrayChallengerLoc[i][0], AffrayChallengerLoc[i][1], AffrayChallengerLoc[i][2], AffrayChallengerLoc[i][3], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
+                        if(!pCreature)
+                            continue;
                         pCreature->setFaction(35);
                         pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -317 +319 @@
                         DoYell(SAY_TWIGGY_FLATHEAD_FRAY,LANG_UNIVERSAL,NULL);
                         Creature* pCreature = (Creature*)Unit::GetUnit((*m_creature), AffrayChallenger[Wave]);
-                        if(pCreature || (pCreature->isAlive())) {
+                        if(pCreature && (pCreature->isAlive())) {
                             pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                             pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -328 +330 @@
                     }
                     else if (Wave >= 6 && !EventBigWill) {
-                        Creature* pCreature = m_creature->SummonCreature(BIG_WILL, -1722, -4341, 6.12, 6.26, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 480000);
-                        BigWill = pCreature->GetGUID();
-                        //pCreature->GetMotionMaster()->MovePoint(0, -1693, -4343, 4.32);
-                        //pCreature->GetMotionMaster()->MovePoint(1, -1684, -4333, 2.78);
-                        pCreature->GetMotionMaster()->MovePoint(2, -1682, -4329, 2.79);
-                        //pCreature->HandleEmoteCommand(15);
-                        pCreature->HandleEmoteCommand(27);
-                        EventBigWill = true;
-                        Wave_Timer = 1000;
+                        if(Creature* pCreature = m_creature->SummonCreature(BIG_WILL, -1722, -4341, 6.12, 6.26, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 480000))
+                        {
+                            BigWill = pCreature->GetGUID();
+                            //pCreature->GetMotionMaster()->MovePoint(0, -1693, -4343, 4.32);
+                            //pCreature->GetMotionMaster()->MovePoint(1, -1684, -4333, 2.78);
+                            pCreature->GetMotionMaster()->MovePoint(2, -1682, -4329, 2.79);
+                            //pCreature->HandleEmoteCommand(15);
+                            pCreature->HandleEmoteCommand(27);
+                            EventBigWill = true;
+                            Wave_Timer = 1000;
+                        }
                     }
                     else if (Wave >= 6 && EventBigWill && BigWill) {
                         Creature* pCreature = (Creature*)Unit::GetUnit((*m_creature), BigWill);
-                        if (!pCreature->isAlive()) {
+                        if (!pCreature || !pCreature->isAlive()) {
                             DoYell(SAY_TWIGGY_FLATHEAD_OVER,LANG_UNIVERSAL,NULL);
                             EventInProgress = false;