Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Fixed -Wmisleading-indentation warnings

Browse Source
This commit is contained in:
Shauren
2016-04-23 13:22:03 +02:00
parent 67fd3ee726
commit 3ac33163db
12 changed files with 173 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Server/Protocol/PacketLog.cpp
View File

@@ -46,7 +46,7 @@ struct PacketHeader
uint32 SocketPort;
};
char Direction[4];
uint32 Direction;
uint32 ConnectionId;
uint32 ArrivalTicks;
uint32 OptionalDataSize;
@@ -110,7 +110,7 @@ void PacketLog::LogPacket(WorldPacket const& packet, Direction direction, boost:
std::lock_guard<std::mutex> lock(_logPacketLock);
PacketHeader header;
*reinterpret_cast<uint32*>(header.Direction) = direction == CLIENT_TO_SERVER ? 0x47534d43 : 0x47534d53;
header.Direction = direction == CLIENT_TO_SERVER ? 0x47534d43 : 0x47534d53;
header.ConnectionId = connectionType;
header.ArrivalTicks = getMSTime();

12
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
View File

@@ -894,12 +894,12 @@ public:
if (instance->GetBossState(DATA_HORSEMAN_EVENT) == IN_PROGRESS)
return false;
player->AreaExploredOrEventHappens(11405);
if (Creature* horseman = go->SummonCreature(HH_MOUNTED, FlightPoint[20].x, FlightPoint[20].y, FlightPoint[20].z, 0, TEMPSUMMON_MANUAL_DESPAWN, 0))
{
ENSURE_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->PlayerGUID = player->GetGUID();
ENSURE_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->FlyMode();
}
player->AreaExploredOrEventHappens(11405);
if (Creature* horseman = go->SummonCreature(HH_MOUNTED, FlightPoint[20].x, FlightPoint[20].y, FlightPoint[20].z, 0, TEMPSUMMON_MANUAL_DESPAWN, 0))
{
ENSURE_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->PlayerGUID = player->GetGUID();
ENSURE_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->FlyMode();
}
return true;
}
};

2
src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
View File

@@ -174,7 +174,7 @@ public:
if (state == DONE)
if (GameObject* go = instance->GetGameObject(shrineOfGelihastGUID))
go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
break;
break;
case DATA_AKU_MAI:
if (state == DONE)
if (GameObject* go = instance->GetGameObject(altarOfTheDeepsGUID))

12
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
View File

@@ -535,12 +535,12 @@ public:
if (!UpdateVictim())
return;
/// @todo add his abilities'n-crap here
if (!LowHp && HealthBelowPct(20))
{
Talk(SAY_TH_RANDOM_LOW_HP);
LowHp = true;
}
/// @todo add his abilities'n-crap here
if (!LowHp && HealthBelowPct(20))
{
Talk(SAY_TH_RANDOM_LOW_HP);
LowHp = true;
}
}
};

46
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
View File

@@ -106,33 +106,33 @@ public:
if (!UpdateVictim())
return;
events.Update(diff);
events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
while (uint32 eventId = events.ExecuteEvent())
while (uint32 eventId = events.ExecuteEvent())
{
switch (eventId)
{
switch (eventId)
{
case EVENT_SANDBREATH:
DoCastVictim(SPELL_SAND_BREATH);
events.ScheduleEvent(EVENT_SANDBREATH, urand(15000, 25000));
break;
case EVENT_TIMESTOP:
DoCastVictim(SPELL_TIME_STOP);
events.ScheduleEvent(EVENT_TIMESTOP, urand(20000, 35000));
break;
case EVENT_FRENZY:
Talk(EMOTE_FRENZY);
DoCast(me, SPELL_ENRAGE);
events.ScheduleEvent(EVENT_FRENZY, urand(20000, 35000));
break;
default:
break;
}
case EVENT_SANDBREATH:
DoCastVictim(SPELL_SAND_BREATH);
events.ScheduleEvent(EVENT_SANDBREATH, urand(15000, 25000));
break;
case EVENT_TIMESTOP:
DoCastVictim(SPELL_TIME_STOP);
events.ScheduleEvent(EVENT_TIMESTOP, urand(20000, 35000));
break;
case EVENT_FRENZY:
Talk(EMOTE_FRENZY);
DoCast(me, SPELL_ENRAGE);
events.ScheduleEvent(EVENT_FRENZY, urand(20000, 35000));
break;
default:
break;
}
DoMeleeAttackIfReady();
}
DoMeleeAttackIfReady();
}
};

52
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
View File

@@ -107,36 +107,36 @@ public:
if (!UpdateVictim())
return;
events.Update(diff);
events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
while (uint32 eventId = events.ExecuteEvent())
while (uint32 eventId = events.ExecuteEvent())
{
switch (eventId)
{
switch (eventId)
{
case EVENT_HASTE:
DoCast(me, SPELL_HASTE);
events.ScheduleEvent(EVENT_HASTE, urand(20000, 25000));
break;
case EVENT_MORTAL_WOUND:
DoCast(me, SPELL_MORTAL_WOUND);
events.ScheduleEvent(EVENT_MORTAL_WOUND, urand(10000, 20000));
break;
case EVENT_WING_BUFFET:
DoCast(me, SPELL_WING_BUFFET);
events.ScheduleEvent(EVENT_WING_BUFFET, urand(20000, 30000));
break;
case EVENT_SPELL_REFLECTION: // Only in Heroic
DoCast(me, SPELL_REFLECT);
events.ScheduleEvent(EVENT_SPELL_REFLECTION, urand(25000, 35000));
break;
default:
break;
}
case EVENT_HASTE:
DoCast(me, SPELL_HASTE);
events.ScheduleEvent(EVENT_HASTE, urand(20000, 25000));
break;
case EVENT_MORTAL_WOUND:
DoCast(me, SPELL_MORTAL_WOUND);
events.ScheduleEvent(EVENT_MORTAL_WOUND, urand(10000, 20000));
break;
case EVENT_WING_BUFFET:
DoCast(me, SPELL_WING_BUFFET);
events.ScheduleEvent(EVENT_WING_BUFFET, urand(20000, 30000));
break;
case EVENT_SPELL_REFLECTION: // Only in Heroic
DoCast(me, SPELL_REFLECT);
events.ScheduleEvent(EVENT_SPELL_REFLECTION, urand(25000, 35000));
break;
default:
break;
}
DoMeleeAttackIfReady();
}
DoMeleeAttackIfReady();
}
};

4
src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
View File

@@ -1224,13 +1224,15 @@ public:
void DoAction(int32 /*action*/) override
{
if (Vehicle* vehicleTemp = me->GetVehicleKit())
{
if (vehicleTemp->GetPassenger(0) && vehicleTemp->GetPassenger(0)->GetTypeId() == TYPEID_PLAYER)
{
vehicleTemp->RemoveAllPassengers();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
}
me->DespawnOrUnsummon(3*IN_MILLISECONDS);
me->DespawnOrUnsummon(3*IN_MILLISECONDS);
}
void MovementInform(uint32 type, uint32 id) override

32
src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
View File

@@ -1301,15 +1301,17 @@ public:
EventMaiev Event = EVENT_MAIEV_NULL;
for (uint8 i = 1; i <= MaxTimer; ++i)
{
if (Timer[i])
{
if (Timer[i] <= diff)
Event = (EventMaiev)i;
else Timer[i] -= diff;
}
}
switch (Event)
{
switch (Event)
{
case EVENT_MAIEV_STEALTH:
{
me->SetFullHealth();
@@ -1345,21 +1347,21 @@ public:
break;
default:
break;
}
}
if (HealthBelowPct(50))
{
me->SetVisible(false);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
if (Creature* illidan = ObjectAccessor::GetCreature(*me, IllidanGUID))
ENSURE_AI(boss_illidan_stormrage::boss_illidan_stormrageAI, illidan->AI())->DeleteFromThreatList(me->GetGUID());
me->AttackStop();
Timer[EVENT_MAIEV_STEALTH] = 60000; // reappear after 1 minute
MaxTimer = 1;
}
if (HealthBelowPct(50))
{
me->SetVisible(false);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
if (Creature* illidan = ObjectAccessor::GetCreature(*me, IllidanGUID))
ENSURE_AI(boss_illidan_stormrage::boss_illidan_stormrageAI, illidan->AI())->DeleteFromThreatList(me->GetGUID());
me->AttackStop();
Timer[EVENT_MAIEV_STEALTH] = 60000; // reappear after 1 minute
MaxTimer = 1;
}
if (Phase == PHASE_NORMAL_MAIEV)
DoMeleeAttackIfReady();
if (Phase == PHASE_NORMAL_MAIEV)
DoMeleeAttackIfReady();
}
private:

19
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
View File

@@ -180,24 +180,23 @@ class boss_grand_warlock_nethekurse : public CreatureScript
}
void MoveInLineOfSight(Unit* who) override
{
if (!IntroOnce && me->IsWithinDistInMap(who, 30.0f))
{
{
if (who->GetTypeId() != TYPEID_PLAYER)
return;
Talk(SAY_INTRO);
IntroOnce = true;
IsIntroEvent = true;
Talk(SAY_INTRO);
IntroOnce = true;
IsIntroEvent = true;
instance->SetBossState(DATA_NETHEKURSE, IN_PROGRESS);
}
instance->SetBossState(DATA_NETHEKURSE, IN_PROGRESS);
}
if (IsIntroEvent || !IsMainEvent)
return;
if (IsIntroEvent || !IsMainEvent)
return;
ScriptedAI::MoveInLineOfSight(who);
ScriptedAI::MoveInLineOfSight(who);
}
void EnterCombat(Unit* /*who*/) override

145
src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
View File

@@ -325,86 +325,85 @@ class boss_high_astromancer_solarian : public CreatureScript
else
Phase1_Timer-=diff;
}
else
if (Phase == 2)
else if (Phase == 2)
{
//10 seconds after Solarian disappears, 12 mobs spawn out of the three portals.
me->AttackStop();
me->StopMoving();
if (Phase2_Timer <= diff)
{
//10 seconds after Solarian disappears, 12 mobs spawn out of the three portals.
me->AttackStop();
me->StopMoving();
if (Phase2_Timer <= diff)
{
Phase = 3;
for (int i=0; i <= 2; ++i)
for (int j=1; j <= 4; j++)
SummonMinion(NPC_SOLARIUM_AGENT, Portals[i][0], Portals[i][1], Portals[i][2]);
Phase = 3;
for (int i=0; i <= 2; ++i)
for (int j=1; j <= 4; j++)
SummonMinion(NPC_SOLARIUM_AGENT, Portals[i][0], Portals[i][1], Portals[i][2]);
Talk(SAY_SUMMON1);
Phase2_Timer = 10000;
}
else
Phase2_Timer -= diff;
Talk(SAY_SUMMON1);
Phase2_Timer = 10000;
}
else
if (Phase == 3)
{
me->AttackStop();
me->StopMoving();
//Check Phase3_Timer
if (Phase3_Timer <= diff)
{
Phase = 1;
//15 seconds later Solarian reappears out of one of the 3 portals. Simultaneously, 2 healers appear in the two other portals.
int i = rand32() % 3;
me->GetMotionMaster()->Clear();
me->SetPosition(Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O);
Phase2_Timer -= diff;
}
else if (Phase == 3)
{
me->AttackStop();
me->StopMoving();
//Check Phase3_Timer
if (Phase3_Timer <= diff)
{
Phase = 1;
//15 seconds later Solarian reappears out of one of the 3 portals. Simultaneously, 2 healers appear in the two other portals.
int i = rand32() % 3;
me->GetMotionMaster()->Clear();
me->SetPosition(Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O);
for (int j=0; j <= 2; j++)
if (j != i)
SummonMinion(NPC_SOLARIUM_PRIEST, Portals[j][0], Portals[j][1], Portals[j][2]);
for (int j=0; j <= 2; j++)
if (j != i)
SummonMinion(NPC_SOLARIUM_PRIEST, Portals[j][0], Portals[j][1], Portals[j][2]);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetVisible(true);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetVisible(true);
Talk(SAY_SUMMON2);
AppearDelay = true;
Phase3_Timer = 15000;
}
else
Phase3_Timer -= diff;
}
else
if (Phase == 4)
{
//Fear_Timer
if (Fear_Timer <= diff)
{
DoCast(me, SPELL_FEAR);
Fear_Timer = 20000;
}
else
Fear_Timer -= diff;
//VoidBolt_Timer
if (VoidBolt_Timer <= diff)
{
DoCastVictim(SPELL_VOID_BOLT);
VoidBolt_Timer = 10000;
}
else
VoidBolt_Timer -= diff;
}
//When Solarian reaches 20% she will transform into a huge void walker.
if (Phase != 4 && me->HealthBelowPct(20))
{
Phase = 4;
//To make sure she wont be invisible or not selecatble
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetVisible(true);
Talk(SAY_VOIDA);
Talk(SAY_VOIDB);
me->SetArmor(WV_ARMOR);
me->SetDisplayId(MODEL_VOIDWALKER);
me->SetObjectScale(defaultsize*2.5f);
}
Talk(SAY_SUMMON2);
AppearDelay = true;
Phase3_Timer = 15000;
}
else
Phase3_Timer -= diff;
}
else if (Phase == 4)
{
//Fear_Timer
if (Fear_Timer <= diff)
{
DoCast(me, SPELL_FEAR);
Fear_Timer = 20000;
}
else
Fear_Timer -= diff;
//VoidBolt_Timer
if (VoidBolt_Timer <= diff)
{
DoCastVictim(SPELL_VOID_BOLT);
VoidBolt_Timer = 10000;
}
else
VoidBolt_Timer -= diff;
}
//When Solarian reaches 20% she will transform into a huge void walker.
if (Phase != 4 && me->HealthBelowPct(20))
{
Phase = 4;
//To make sure she wont be invisible or not selecatble
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetVisible(true);
Talk(SAY_VOIDA);
Talk(SAY_VOIDB);
me->SetArmor(WV_ARMOR);
me->SetDisplayId(MODEL_VOIDWALKER);
me->SetObjectScale(defaultsize*2.5f);
}
DoMeleeAttackIfReady();
}
};

2
src/server/scripts/World/go_scripts.cpp
View File

@@ -1100,7 +1100,7 @@ public:
player->CastSpell(player, SPELL_CLEANSING_SOUL);
player->SetStandState(UNIT_STAND_STATE_SIT);
}
return true;
return true;
}
};

14
src/server/scripts/World/item_scripts.cpp
View File

@@ -57,18 +57,18 @@ public:
//for special scripts
switch (itemId)
{
case 24538:
case 24538:
if (player->GetAreaId() != 3628)
disabled = true;
break;
case 34489:
break;
case 34489:
if (player->GetZoneId() != 4080)
disabled = true;
break;
case 34475:
if (const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(SPELL_ARCANE_CHARGES))
break;
case 34475:
if (SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(SPELL_ARCANE_CHARGES))
Spell::SendCastResult(player, spellInfo, 1, SPELL_FAILED_NOT_ON_GROUND);
break;
break;
}
// allow use in flight only