Core/Units: Rename and change Get/SetVisibility to use a bool value instead of an unnecessary enum

Also replace some SetVisibility hacks to directly call UpdateObjectVisibility

--HG--
branch : trunk

20 files changed, 50 insertions, 50 deletions

diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
index 051352c5051..1a72efe6e79 100644
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
@@ -195,7 +195,7 @@ public:
                             Creature* cr = instance->GetCreature(*itr);
                             if (cr && cr->isAlive())
                             {
-                                cr->SetVisibility(VISIBILITY_OFF);
+                                cr->SetVisible(false);
                                 cr->setDeathState(JUST_DIED);
                                 cr->RemoveCorpse();
                             }
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
index bbe9cf54a3f..3edb3f0014c 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
@@ -215,8 +215,8 @@ class npc_announcer_toc10 : public CreatureScript
 
                     m_pInstance->SetData(TYPE_ANUBARAK,NOT_STARTED);
 
-                    if (pCreature->GetVisibility() == VISIBILITY_ON)
-                        pCreature->SetVisibility(VISIBILITY_OFF);
+                    if (pCreature->IsVisible())
+                        pCreature->SetVisible(false);
                     break;
                 }
             }
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
index 9b247be6733..72fc965c170 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
@@ -223,7 +223,7 @@ public:
 
             me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
             me->SetStandState(UNIT_STAND_STATE_STAND);
-            me->SetVisibility(VISIBILITY_ON);
+            me->SetVisible(true);
         }
 
         void DoAction(const int32 actionId)
@@ -476,9 +476,9 @@ public:
                 case EVENT_INTRO_LK_5:
                     // summon Falric and Marwyn. then go back to the door
                     if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC)))
-                        pFalric->SetVisibility(VISIBILITY_ON);
+                        pFalric->SetVisible(true);
                     if (Creature* pMarwyn = me->GetCreature(*me, pInstance->GetData64(DATA_MARWYN)))
-                        pMarwyn->SetVisibility(VISIBILITY_ON);
+                        pMarwyn->SetVisible(true);
 
                     if (Creature* pLichKing = me->GetCreature(*me, uiLichKing))
                     {
@@ -533,9 +533,9 @@ public:
                     // TODO: implement
 
                     if (Creature* pFalric = me->GetCreature(*me, pInstance->GetData64(DATA_FALRIC)))
-                        pFalric->SetVisibility(VISIBILITY_ON);
+                        pFalric->SetVisible(true);
                     if (Creature* pMarwyn = me->GetCreature(*me, pInstance->GetData64(DATA_MARWYN)))
-                        pMarwyn->SetVisibility(VISIBILITY_ON);
+                        pMarwyn->SetVisible(true);
 
                     me->GetMotionMaster()->MovePoint(0, LichKingSpawnPos);
                     // TODO: Loralen/Koreln shall run also
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
index bccccffd655..d2c6ca7f973 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
@@ -91,7 +91,7 @@ struct boss_horAI : ScriptedAI
     void Reset()
     {
         events.Reset();
-        me->SetVisibility(VISIBILITY_OFF);
+        me->SetVisible(false);
         me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE);
         me->SetReactState(REACT_PASSIVE);
     }
@@ -108,7 +108,7 @@ struct boss_horAI : ScriptedAI
         {
             case ACTION_ENTER_COMBAT:  // called by InstanceScript when boss shall enter in combat.
                 // Just in case. Should have been done by InstanceScript
-                me->SetVisibility(VISIBILITY_ON);
+                me->SetVisible(true);
 
                 // Reset flags
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE);
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
index 455dfea60e0..f86878bbc3f 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
@@ -377,9 +377,9 @@ public:
                 pSylvanas->Respawn();
 
             if (Creature* pFalric = instance->GetCreature(uiFalric))
-                pFalric->SetVisibility(VISIBILITY_OFF);
+                pFalric->SetVisible(false);
             if (Creature* pMarwyn = instance->GetCreature(uiMarwyn))
-                pMarwyn->SetVisibility(VISIBILITY_OFF);
+                pMarwyn->SetVisible(false);
         }
 
         // spawn a wave on behalf of the summoner.
@@ -387,7 +387,7 @@ public:
         {
             uint32 index;
 
-            pSummoner->SetVisibility(VISIBILITY_ON);
+            pSummoner->SetVisible(true);
 
             // TODO: do composition at random. # of spawn also depends on uiWaveCount
             // As of now, it is just one of each.
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
index d1b73e364ac..810c61be823 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
@@ -306,7 +306,7 @@ public:
 
             me->SetReactState(REACT_PASSIVE);
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-            me->SetVisibility(VISIBILITY_OFF);
+            me->SetVisible(false);
         }
 
         Creature* GetIck()
@@ -341,7 +341,7 @@ public:
                         pIck->GetNearPosition(pos, 5.0f, 3.14f);
                         me->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), 0.0f);
                     }
-                    me->SetVisibility(VISIBILITY_ON);
+                    me->SetVisible(true);
 
                     Creature* pJainaOrSylvanas = me->GetCreature(*me, pInstance->GetData64(DATA_JAINA_SYLVANAS_1));
                     if (pJainaOrSylvanas) {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
index 2be0277b541..82498cd85a9 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
@@ -944,11 +944,11 @@ class npc_blood_queen_lana_thel : public CreatureScript
                 me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
                 if (instance->GetBossState(DATA_BLOOD_PRINCE_COUNCIL) == DONE)
                 {
-                    me->SetVisibility(VISIBILITY_OFF);
+                    me->SetVisible(false);
                     bIntroDone = true;
                 }
                 else
-                    me->SetVisibility(VISIBILITY_ON);
+                    me->SetVisible(true);
             }
 
             void MoveInLineOfSight(Unit* who)
@@ -975,7 +975,7 @@ class npc_blood_queen_lana_thel : public CreatureScript
             void MovementInform(uint32 type, uint32 id)
             {
                 if (type == POINT_MOTION_TYPE && id == POINT_INTRO_DESPAWN)
-                    me->SetVisibility(VISIBILITY_OFF);
+                    me->SetVisible(false);
             }
 
             void UpdateAI(const uint32 diff)
@@ -1135,7 +1135,7 @@ class npc_kinetic_bomb : public CreatureScript
                     switch (eventId)
                     {
                         case EVENT_BOMB_DESPAWN:
-                            me->SetVisibility(VISIBILITY_OFF);
+                            me->SetVisible(false);
                             break;
                         case EVENT_CONTINUE_FALLING:
                             me->GetMotionMaster()->Clear();
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
index c01a2a1741a..5d3a86cd992 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
@@ -343,7 +343,7 @@ class npc_big_ooze : public CreatureScript
                 {
                     bExploded = true;
                     me->RemoveAllAuras();
-                    me->SetVisibility(VISIBILITY_OFF);
+                    me->SetVisible(false);
                     events.Reset();
                     events.ScheduleEvent(EVENT_UNSTABLE_DESPAWN, 60000);
                 }
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
index 5d8d858a38c..3ed263ffae5 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
@@ -100,7 +100,7 @@ public:
             float x, y, z;
             me->GetPosition(x, y, z);
             me->SummonGameObject(GO_BIRTH, x, y, z, 0, 0, 0, 0, 0, 0);
-            me->SetVisibility(VISIBILITY_OFF);
+            me->SetVisible(false);
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
             me->SetReactState(REACT_PASSIVE);
 
@@ -344,7 +344,7 @@ public:
                             EnterPhaseGround();
                             return;
                         case EVENT_BIRTH:
-                            me->SetVisibility(VISIBILITY_ON);
+                            me->SetVisible(true);
                             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                             me->SetReactState(REACT_AGGRESSIVE);
                             return;
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
index 6a2da3e6b5d..500791619cb 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
@@ -114,7 +114,7 @@ public:
             bIsWaitingToAppear = false;
 
             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-            me->SetVisibility(VISIBILITY_ON);
+            me->SetVisible(true);
 
             if (pInstance)
                 pInstance->SetData(DATA_MAGUS_TELESTRA_EVENT, NOT_STARTED);
@@ -225,7 +225,7 @@ public:
                     me->GetMotionMaster()->Clear();
                     me->GetMap()->CreatureRelocation(me, CenterOfRoom.GetPositionX(), CenterOfRoom.GetPositionY(), CenterOfRoom.GetPositionZ(), CenterOfRoom.GetOrientation());
                     DoCast(me, SPELL_TELESTRA_BACK);
-                    me->SetVisibility(VISIBILITY_ON);
+                    me->SetVisible(true);
                     if (Phase == 1)
                         Phase = 2;
                     if (Phase == 3)
@@ -248,7 +248,7 @@ public:
                 Phase = 1;
                 me->CastStop();
                 me->RemoveAllAuras();
-                me->SetVisibility(VISIBILITY_OFF);
+                me->SetVisible(false);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 uiFireMagusGUID = SplitPersonality(MOB_FIRE_MAGUS);
                 uiFrostMagusGUID = SplitPersonality(MOB_FROST_MAGUS);
@@ -265,7 +265,7 @@ public:
                 Phase = 3;
                 me->CastStop();
                 me->RemoveAllAuras();
-                me->SetVisibility(VISIBILITY_OFF);
+                me->SetVisible(false);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 uiFireMagusGUID = SplitPersonality(MOB_FIRE_MAGUS);
                 uiFrostMagusGUID = SplitPersonality(MOB_FROST_MAGUS);
diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
index 37898942545..f3e8d892f04 100644
--- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
+++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
@@ -1400,7 +1400,7 @@ public:
         {
             if(uiDespawnTimer < uiDiff)
             {
-                me->SetVisibility(VISIBILITY_OFF);
+                me->SetVisible(false);
                 me->Kill(me);
                 uiDespawnTimer = 28000;
                 return;
@@ -1496,7 +1496,7 @@ public:
         {
             if(uiDespawnTimer < uiDiff)
             {
-                me->SetVisibility(VISIBILITY_OFF);
+                me->SetVisible(false);
                 me->Kill(me);
                 uiDespawnTimer = 28000;
                 return;
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
index 25c62237830..c5068c3080f 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
@@ -83,7 +83,7 @@ public:
                 pCreatureTarget->CastSpell(pCreatureTarget, SPELL_SUMMON_SPARK, true);
 
             pCreatureTarget->AttackStop();
-            pCreatureTarget->SetVisibility(VISIBILITY_OFF);
+            pCreatureTarget->SetVisible(false);
             pCreatureTarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_DISABLE_MOVE);
 
             pCreatureTarget->GetMotionMaster()->Clear();
@@ -137,8 +137,8 @@ public:
 
             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_DISABLE_MOVE);
 
-            if (me->GetVisibility() == VISIBILITY_OFF)
-                me->SetVisibility(VISIBILITY_ON);
+            if (!me->IsVisible())
+                me->SetVisible(true);
 
             if (pInstance)
                 pInstance->SetData(TYPE_IONAR, NOT_STARTED);
@@ -195,7 +195,7 @@ public:
 
         void DamageTaken(Unit * /*pDoneBy*/, uint32 &uiDamage)
         {
-            if (me->GetVisibility() == VISIBILITY_OFF)
+            if (!me->IsVisible())
                 uiDamage = 0;
         }
 
@@ -230,7 +230,7 @@ public:
                 return;
 
             // Splitted
-            if (me->GetVisibility() == VISIBILITY_OFF)
+            if (!me->IsVisible())
             {
                 if (uiSplitTimer <= uiDiff)
                 {
@@ -245,7 +245,7 @@ public:
                     // Lightning effect and restore Ionar
                     else if (lSparkList.empty())
                     {
-                        me->SetVisibility(VISIBILITY_ON);
+                        me->SetVisible(true);
                         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_DISABLE_MOVE);
 
                         DoCast(me, SPELL_SPARK_DESPAWN, false);
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
index 8e075f2ae7c..1e0e98fa550 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp
@@ -1204,7 +1204,7 @@ public:
             if (Creature* pLeviathan = instance->instance->GetCreature(instance->GetData64(TYPE_LEVIATHAN)))
             {
                 CAST_AI(boss_flame_leviathan::boss_flame_leviathanAI, (pLeviathan->AI()))->DoAction(0); //enable hard mode activating the 4 additional events spawning additional vehicles
-                pCreature->SetVisibility(VISIBILITY_OFF);
+                pCreature->SetVisible(false);
                 pCreature->AI()->DoAction(0); // spawn the vehicles
                 if (Creature* Delorah = pCreature->FindNearestCreature(NPC_DELORAH, 1000, true))
                 {
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
index 0977c32296d..29aefd24212 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
@@ -579,7 +579,7 @@ public:
         npc_mole_machine_triggerAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
         {
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PACIFIED);
-            me->SetVisibility(VISIBILITY_OFF);
+            me->SetVisible(false);
         }
 
         GameObject* MoleMachine;
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
index 4702bf2192f..4d137dcf37e 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
@@ -344,7 +344,7 @@ public:
                     uiResurectPhase = 1;
                     break;
                 case 2:
-                    me->SetVisibility(VISIBILITY_OFF);
+                    me->SetVisible(false);
                     me->DealDamage(me,me->GetHealth());
                     me->RemoveCorpse();
                     break;
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
index 73b75f5b622..37327256e64 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
@@ -258,7 +258,7 @@ public:
     {
         mob_frozen_orb_stalkerAI(Creature* c) : Scripted_NoMovementAI(c)
         {
-            c->SetVisibility(VISIBILITY_OFF);
+            c->SetVisible(false);
             c->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_DISABLE_MOVE);
             c->SetReactState(REACT_PASSIVE);
 
diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
index 14539491bc3..f954825ab17 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
@@ -108,7 +108,7 @@ public:
             uiBubbleCheckerTimer = 1000;
             uiWaterBoltVolleyTimer = urand(10000, 15000);
 
-            me->SetVisibility(VISIBILITY_ON);
+            me->SetVisible(true);
             DespawnWaterElements();
 
             if (pInstance)
@@ -195,7 +195,7 @@ public:
                 DoCast(me, SPELL_PROTECTIVE_BUBBLE, true);
             }
 
-            me->SetVisibility(VISIBILITY_ON);
+            me->SetVisible(true);
             me->GetMotionMaster()->MoveChase(me->getVictim());
         }
 
@@ -227,7 +227,7 @@ public:
                             DoCast(me, SPELL_DRAINED);
                             bIsExploded = true;
                             me->AttackStop();
-                            me->SetVisibility(VISIBILITY_OFF);
+                            me->SetVisible(false);
                             for (uint8 i = 0; i < 10; i++)
                             {
                                 int tmp = urand(0, MAX_SPAWN_LOC-1);
@@ -277,7 +277,7 @@ public:
             if (bIsExploded)
             {
                 bIsExploded = false;
-                me->SetVisibility(VISIBILITY_ON);
+                me->SetVisible(true);
             }
 
             DespawnWaterElements();
diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index f41bf090412..c32bbfaa0d1 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -705,7 +705,7 @@ public:
 
                 if (Creature* pSinclari = instance->GetCreature(uiSinclari))
                 {
-                    pSinclari->SetVisibility(VISIBILITY_ON);
+                    pSinclari->SetVisible(true);
 
                     std::list<Creature*> GuardList;
                     pSinclari->GetCreatureListWithEntryInGrid(GuardList, NPC_VIOLET_HOLD_GUARD, 40.0f);
@@ -715,7 +715,7 @@ public:
                         {
                             if (Creature* pGuard = *itr)
                             {
-                                pGuard->SetVisibility(VISIBILITY_ON);
+                                pGuard->SetVisible(true);
                                 pGuard->SetReactState(REACT_AGGRESSIVE);
                                 pGuard->GetMotionMaster()->MovePoint(1,pGuard->GetHomePosition());
                             }
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
index 9a3d9c934d2..db6d72f1a83 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
@@ -332,7 +332,7 @@ public:
                     {
                         pGuard->DisappearAndDie();
                         pGuard->Respawn();
-                        pGuard->SetVisibility(VISIBILITY_ON);
+                        pGuard->SetVisible(true);
                         pGuard->SetReactState(REACT_AGGRESSIVE);
                     }
                 }
@@ -380,7 +380,7 @@ public:
                                 {
                                     if (Creature* pGuard = *itr)
                                     {
-                                        pGuard->SetVisibility(VISIBILITY_OFF);
+                                        pGuard->SetVisible(false);
                                         pGuard->SetReactState(REACT_PASSIVE);
                                     }
                                 }
@@ -609,7 +609,7 @@ public:
                                 uint32 entry = RAND(CREATURE_AZURE_CAPTAIN,CREATURE_AZURE_RAIDER,CREATURE_AZURE_STALKER,CREATURE_AZURE_SORCEROR);
                                 DoSummon(entry, me, 2.0f, 20000, TEMPSUMMON_DEAD_DESPAWN);
                             }
-                            me->SetVisibility(VISIBILITY_OFF);
+                            me->SetVisible(false);
                         } else uiSpawnTimer -= diff;
                     }
                     else
diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp
index b62fcfcdae0..dfeee0bc505 100644
--- a/src/server/scripts/Northrend/borean_tundra.cpp
+++ b/src/server/scripts/Northrend/borean_tundra.cpp
@@ -575,7 +575,7 @@ public:
 
     struct npc_nesingwary_trapperAI : public ScriptedAI
     {
-        npc_nesingwary_trapperAI(Creature *c) : ScriptedAI(c) { c->SetVisibility(VISIBILITY_OFF); }
+        npc_nesingwary_trapperAI(Creature *c) : ScriptedAI(c) { c->SetVisible(false); }
 
         uint64 go_caribouGUID;
         uint8  Phase;
@@ -583,7 +583,7 @@ public:
 
         void Reset()
         {
-            me->SetVisibility(VISIBILITY_OFF);
+            me->SetVisible(false);
             uiPhaseTimer = 2500;
             Phase = 1;
             go_caribouGUID = 0;
@@ -613,7 +613,7 @@ public:
                 switch (Phase)
                 {
                     case 1:
-                        me->SetVisibility(VISIBILITY_ON);
+                        me->SetVisible(true);
                         uiPhaseTimer = 2000;
                         Phase = 2;
                         break;