josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Also replace some SetVisibility hacks to directly call UpdateObjectVisibility

--HG--
branch : trunk
This commit is contained in:
linencloth
2010-11-16 01:13:04 +01:00
parent 57c76407b0
commit 8fae0c176d
70 changed files with 181 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+17 -17
View File
@@ -876,7 +876,7 @@ public:
{
if (GETUNIT(Glaive, GlaiveGUID[i]))
{
Glaive->SetVisibility(VISIBILITY_OFF);
Glaive->SetVisible(false);
Glaive->setDeathState(JUST_DIED); // Despawn the Glaive
}
GlaiveGUID[i] = 0;
@@ -1229,7 +1229,7 @@ public:
if (Timer[EVENT_MAIEV_STEALTH])
{
me->SetFullHealth();
me->SetVisibility(VISIBILITY_ON);
me->SetVisible(true);
Timer[EVENT_MAIEV_STEALTH] = 0;
}
me->InterruptNonMeleeSpells(false);
@@ -1307,7 +1307,7 @@ public:
case EVENT_MAIEV_STEALTH:
{
me->SetFullHealth();
me->SetVisibility(VISIBILITY_ON);
me->SetVisible(true);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
Timer[EVENT_MAIEV_STEALTH] = 0;
BlinkToPlayer();
@@ -1349,7 +1349,7 @@ public:
if (HealthBelowPct(50))
{
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
if (GETCRE(Illidan, IllidanGUID))
CAST_AI(boss_illidan_stormrage::boss_illidan_stormrageAI, Illidan->AI())->DeleteFromThreatList(me->GetGUID());
@@ -1446,7 +1446,7 @@ public:
me->SetUInt32Value(UNIT_NPC_FLAGS, 0); // Database sometimes has strange values..
me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
me->setActive(false);
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
}
// Do not call reset in Akama's evade mode, as this will stop him from summoning minions after he kills the first bit
@@ -1529,7 +1529,7 @@ public:
for (uint8 i = 0; i < 2; ++i)
if (Creature* Spirit = me->SummonCreature(i ? SPIRIT_OF_OLUM : SPIRIT_OF_UDALO, SpiritSpawns[i].x, SpiritSpawns[i].y, SpiritSpawns[i].z, 0, TEMPSUMMON_TIMED_DESPAWN, 20000))
{
Spirit->SetVisibility(VISIBILITY_OFF);
Spirit->SetVisible(false);
SpiritGUID[i] = Spirit->GetGUID();
}
}
@@ -1649,8 +1649,8 @@ public:
Timer = 2000;
break;
case 1: // spirit appear
Spirit[0]->SetVisibility(VISIBILITY_ON);
Spirit[1]->SetVisibility(VISIBILITY_ON);
Spirit[0]->SetVisible(true);
Spirit[1]->SetVisible(true);
Timer = 2000;
break;
case 2: // spirit help
@@ -1675,8 +1675,8 @@ public:
me->MonsterYell(SAY_AKAMA_BEWARE, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_AKAMA_BEWARE);
Channel->setDeathState(JUST_DIED);
Spirit[0]->SetVisibility(VISIBILITY_OFF);
Spirit[1]->SetVisibility(VISIBILITY_OFF);
Spirit[0]->SetVisible(false);
Spirit[1]->SetVisible(false);
Timer = 3000;
break;
case 6:
@@ -1718,12 +1718,12 @@ public:
void UpdateAI(const uint32 diff)
{
if (me->GetVisibility() == VISIBILITY_OFF)
if (!me->IsVisible())
{
if (Check_Timer <= diff)
{
if (pInstance && pInstance->GetData(DATA_ILLIDARICOUNCILEVENT) == DONE)
me->SetVisibility(VISIBILITY_ON);
me->SetVisible(true);
Check_Timer = 5000;
} else Check_Timer -= diff;
@@ -1882,7 +1882,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::JustSummoned(Creature* su
{
if (Phase == PHASE_TALK_SEQUENCE)
{
summon->SetVisibility(VISIBILITY_OFF);
summon->SetVisible(false);
summon->setDeathState(JUST_DIED);
return;
}
@@ -1903,7 +1903,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::JustSummoned(Creature* su
break;
case MAIEV_SHADOWSONG:
{
summon->SetVisibility(VISIBILITY_OFF); // Leave her invisible until she has to talk
summon->SetVisible(false); // Leave her invisible until she has to talk
summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
MaievGUID = summon->GetGUID();
CAST_AI(boss_maiev_shadowsong::boss_maievAI, summon->AI())->GetIllidanGUID(me->GetGUID());
@@ -1948,7 +1948,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::HandleTalkSequence()
case 11:
if (GETUNIT(Maiev, MaievGUID))
{
Maiev->SetVisibility(VISIBILITY_ON); // Maiev is now visible
Maiev->SetVisible(true); // Maiev is now visible
Maiev->CastSpell(Maiev, SPELL_TELEPORT_VISUAL, true); // onoz she looks like she teleported!
Maiev->SetInFront(me); // Have her face us
me->SetInFront(Maiev); // Face her, so it's not rude =P
@@ -2235,7 +2235,7 @@ public:
AttackStart(pTarget);
else
{
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
me->setDeathState(JUST_DIED);
return;
}
@@ -2246,7 +2246,7 @@ public:
GETUNIT(Illidan, IllidanGUID);
if (!Illidan || CAST_CRE(Illidan)->IsInEvadeMode())
{
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
me->setDeathState(JUST_DIED);
return;
} else CheckTimer = 5000;
src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+1 -1
View File
@@ -262,7 +262,7 @@ public:
IsBanished = true;
HasKilledAkama = false;
me->SetVisibility(VISIBILITY_ON);
me->SetVisible(true);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
//me->GetMotionMaster()->Clear();
src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ public:
float x, y, z;
me->GetNearPoint(me, x, y, z, 1, 100, float(M_PI*2*rand_norm()));
me->GetMotionMaster()->MovePoint(0, x, y, z);
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
me->CastSpell(me,SPELL_MOLTEN_FLAME,true);
}
};
src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+3 -3
View File
@@ -802,7 +802,7 @@ public:
AppearEnvenomTimer = 150000;
HasVanished = false;
me->SetVisibility(VISIBILITY_ON);
me->SetVisible(true);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
@@ -842,7 +842,7 @@ public:
VanishTimer = 30000;
AppearEnvenomTimer= 28000;
HasVanished = true;
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
DoResetThreat();
// Chase a unit. Check before DoMeleeAttackIfReady prevents from attacking
@@ -872,7 +872,7 @@ public:
{
me->GetMotionMaster()->Clear();
me->GetMotionMaster()->MoveChase(me->getVictim());
me->SetVisibility(VISIBILITY_ON);
me->SetVisible(true);
AppearEnvenomTimer = 6000;
} else AppearEnvenomTimer -= diff;
}
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+2 -2
View File
@@ -141,7 +141,7 @@ public:
pInstance->SetData(DATA_STRANGE_POOL, NOT_STARTED);
}
DoCast(me, SPELL_SUBMERGE);//submerge anim
me->SetVisibility(VISIBILITY_OFF);//we start invis under water, submerged
me->SetVisible(false);//we start invis under water, submerged
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
}
@@ -189,7 +189,7 @@ public:
{
if (Submerged)
{
me->SetVisibility(VISIBILITY_ON);
me->SetVisible(true);
Submerged = false;
WaitTimer2 = 500;
}
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+2 -2
View File
@@ -338,7 +338,7 @@ class boss_vazruden_the_herald : public CreatureScript
}
summoned = false;
me->clearUnitState(UNIT_STAT_ROOT);
me->SetVisibility(VISIBILITY_ON);
me->SetVisible(true);
}
}
@@ -351,7 +351,7 @@ class boss_vazruden_the_herald : public CreatureScript
if (Creature* Nazan = me->SummonCreature(ENTRY_NAZAN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000))
NazanGUID = Nazan->GetGUID();
summoned = true;
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
me->addUnitState(UNIT_STAT_ROOT);
}
}
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+1 -1
View File
@@ -129,7 +129,7 @@ class mob_abyssal : public CreatureScript
if (trigger == 2 && spell->Id == SPELL_BLAZE_TARGET)
{
DoCast(me, SPELL_BLAZE_TRAP, true);
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
Despawn_Timer = 130000;
}
}
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+1 -1
View File
@@ -266,7 +266,7 @@ class boss_warbringer_omrogg : public CreatureScript
//summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
//summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
summoned->SetVisibility(VISIBILITY_OFF);
summoned->SetVisible(false);
}
void KilledUnit(Unit* /*victim*/)
src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+4 -4
View File
@@ -136,7 +136,7 @@ class boss_high_astromancer_solarian : public CreatureScript
me->SetArmor(defaultarmor);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetVisibility(VISIBILITY_ON);
me->SetVisible(true);
me->SetFloatValue(OBJECT_FIELD_SCALE_X, defaultsize);
me->SetDisplayId(MODEL_HUMAN);
@@ -207,7 +207,7 @@ class boss_high_astromancer_solarian : public CreatureScript
if (Phase == 2)
{
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
}
AppearDelay_Timer = 2000;
}
@@ -354,7 +354,7 @@ class boss_high_astromancer_solarian : public CreatureScript
SummonMinion(NPC_SOLARIUM_PRIEST, Portals[j][0], Portals[j][1], Portals[j][2]);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetVisibility(VISIBILITY_ON);
me->SetVisible(true);
DoScriptText(SAY_SUMMON2, me);
AppearDelay = true;
@@ -389,7 +389,7 @@ class boss_high_astromancer_solarian : public CreatureScript
Phase = 4;
//To make sure she wont be invisible or not selecatble
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetVisibility(VISIBILITY_ON);
me->SetVisible(true);
DoScriptText(SAY_VOIDA, me);
DoScriptText(SAY_VOIDB, me);
me->SetArmor(WV_ARMOR);
src/server/scripts/Outland/netherstorm.cpp
+1 -1
View File
@@ -618,7 +618,7 @@ public:
case 9:
Turn_to_eachother();
//hide pathaleon, unit will despawn shortly
pathaleon->SetVisibility(VISIBILITY_OFF);
pathaleon->SetVisible(false);
PhaseSubphase = 0;
++Phase;
Phase_Timer = 3000;
src/server/scripts/Outland/shadowmoon_valley.cpp
+6 -6
View File
@@ -226,7 +226,7 @@ public:
FlyTimer = 10000;
me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
me->SetVisibility(VISIBILITY_ON);
me->SetVisible(true);
}
void SpellHit(Unit* caster, const SpellEntry* spell)
@@ -271,7 +271,7 @@ public:
PlayerGUID = 0;
}
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
me->RemoveCorpse();
@@ -808,7 +808,7 @@ public:
if (Illidan)
{
IllidanGUID = Illidan->GetGUID();
Illidan->SetVisibility(VISIBILITY_OFF);
Illidan->SetVisible(false);
}
if (PlayerGUID)
{
@@ -840,7 +840,7 @@ public:
case 2: DoScriptText(OVERLORD_YELL_1, me, plr); return 4500; break;
case 3: me->SetInFront(plr); return 3200; break;
case 4: DoScriptText(OVERLORD_SAY_2, me, plr); return 2000; break;
case 5: Illi->SetVisibility(VISIBILITY_ON);
case 5: Illi->SetVisible(true);
Illi->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); return 350; break;
case 6:
Illi->CastSpell(Illi, SPELL_ONE, true);
@@ -876,7 +876,7 @@ public:
return 500; break;
case 21: DoScriptText(OVERLORD_SAY_5, me); return 500; break;
case 22:
Illi->SetVisibility(VISIBILITY_OFF);
Illi->SetVisible(false);
Illi->setDeathState(JUST_DIED);
return 1000; break;
case 23: me->SetUInt32Value(UNIT_FIELD_BYTES_1,0); return 2000; break;
@@ -1429,7 +1429,7 @@ public:
Announced = false;
Failed = false;
me->SetVisibility(VISIBILITY_OFF);
me->SetVisible(false);
}
void EnterCombat(Unit* /*who*/) {}