diff options
| author | Spp <spp@jorge.gr> | 2013-01-14 09:50:59 +0100 | 
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2013-01-14 09:50:59 +0100 | 
| commit | 802657250c20088d7f42ec7c836589a532e66fcc (patch) | |
| tree | e36baf33f56268d81a58be630957499523de08ef /src/server/scripts/EasternKingdoms | |
| parent | 557fde86e457b8fe337e6916e6573ea8a8ba210c (diff) | |
Core/Misc: Apply codestyle to multiple files
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
12 files changed, 26 insertions, 26 deletions
| diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 3a026d23faa..ae4b6197f4c 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -603,7 +603,7 @@ public:  void netherspite_infernal::netherspite_infernalAI::Cleanup()  { -    Creature *pMalchezaar = Unit::GetCreature(*me, malchezaar); +    Creature* pMalchezaar = Unit::GetCreature(*me, malchezaar);      if (pMalchezaar && pMalchezaar->isAlive())          CAST_AI(boss_malchezaar::boss_malchezaarAI, pMalchezaar->AI())->Cleanup(me, point); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp index 32ce484f715..27e057ce6aa 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp @@ -104,7 +104,7 @@ public:                          {                              me->HandleEmoteCommand(EMOTE_ONESHOT_CUSTOM_SPELL_01);                              DoCast(player, SPELL_REVIVE, true); -                            Talk(WHISPER_REVIVE,player->GetGUID()); +                            Talk(WHISPER_REVIVE, player->GetGUID());                          }                          FlyBackTimer = 5000;                          break; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index b596ad3f609..5d164fbfafa 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -117,7 +117,7 @@ class boss_darkmaster_gandling : public CreatureScript                          case EVENT_SHADOW_PORTAL:                              if (HealthAbovePct(3))                              { -                                DoCast(SelectTarget(SELECT_TARGET_RANDOM,0, 100, true),SPELL_SHADOW_PORTAL,true); +                                DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_SHADOW_PORTAL, true);                                  events.ScheduleEvent(EVENT_SHADOW_PORTAL, urand(17000, 27000));                              }                      } @@ -172,7 +172,7 @@ class spell_shadow_portal : public SpellScriptLoader                  {                      if (attempts++ >= 6) break; -                    switch (urand(0,5)) +                    switch (urand(0, 5))                      {                          case ROOM_HALL_OF_SECRETS:                              if (InstanceScript* instance = GetCaster()->GetInstanceScript()) @@ -223,7 +223,7 @@ class spell_shadow_portal : public SpellScriptLoader          }  }; -// Script for Shadow Portal spells 17863,17939,17943,17944,17946,17948 +// Script for Shadow Portal spells 17863, 17939, 17943, 17944, 17946, 17948  Position const SummonPos[18] =  {      // Hall of Secrects @@ -331,7 +331,7 @@ class spell_shadow_portal_rooms : public SpellScriptLoader                          if (Summoned)                          {                              Summoned->GetMotionMaster()->MoveRandom(5); -                            Summoned->AI()->SetData(0,phase_to_set); +                            Summoned->AI()->SetData(0, phase_to_set);                          }                      } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp index d09a5ae96c9..617dff17220 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp @@ -48,7 +48,7 @@ class boss_illucia_barov : public CreatureScript          struct boss_illuciabarovAI : public BossAI          { -            boss_illuciabarovAI(Creature* creature) : BossAI(creature,DATA_LADYILLUCIABAROV) {} +            boss_illuciabarovAI(Creature* creature) : BossAI(creature, DATA_LADYILLUCIABAROV) {}              void EnterCombat(Unit* /*who*/)              { @@ -78,7 +78,7 @@ class boss_illucia_barov : public CreatureScript                              events.ScheduleEvent(EVENT_CURSEOFAGONY, 30000);                              break;                          case EVENT_SHADOWSHOCK: -                            DoCast(SelectTarget(SELECT_TARGET_RANDOM,0, 100, true),SPELL_SHADOWSHOCK,true); +                            DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_SHADOWSHOCK, true);                              events.ScheduleEvent(EVENT_SHADOWSHOCK, 12000);                              break;                          case EVENT_SILENCE: diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp index 5036158cae2..e2c7287f178 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp @@ -91,7 +91,7 @@ class boss_instructor_malicia : public CreatureScript                              events.ScheduleEvent(EVENT_CALLOFGRAVES, 65000);                              break;                          case EVENT_CORRUPTION: -                            DoCast(SelectTarget(SELECT_TARGET_RANDOM,0, 100, true),SPELL_CORRUPTION,true); +                            DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_CORRUPTION, true);                              events.ScheduleEvent(EVENT_CORRUPTION, 24000);                              break;                          case EVENT_RENEW: diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp index 32c16a1c70c..b0a2d48d053 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -152,7 +152,7 @@ class boss_kirtonos_the_herald : public CreatureScript                          switch (_introEvent)                          {                              case INTRO_1: -                                me->GetMotionMaster()->MovePath(KIRTONOS_PATH,false); +                                me->GetMotionMaster()->MovePath(KIRTONOS_PATH, false);                                  _introEvent = 0;                                  break;                              case INTRO_2: diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp index e8fb4324d00..3a7aee0d6c6 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp @@ -74,7 +74,7 @@ class boss_lord_alexei_barov : public CreatureScript                      switch (eventId)                      {                          case EVENT_IMMOLATE: -                            DoCast(SelectTarget(SELECT_TARGET_RANDOM,0, 100, true),SPELL_IMMOLATE,true); +                            DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_IMMOLATE, true);                              events.ScheduleEvent(EVENT_IMMOLATE, 12000);                              break;                          case EVENT_VEILOFSHADOW: diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index 6e3f024ac1d..c186ada72b7 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -114,7 +114,7 @@ public:              if (instance)              { -                if (Creature *temp =  Unit::GetCreature(*me, instance->GetData64(DATA_ALYTHESS))) +                if (Creature* temp =  Unit::GetCreature(*me, instance->GetData64(DATA_ALYTHESS)))                  {                      if (temp->isDead())                          temp->Respawn(); @@ -145,7 +145,7 @@ public:              if (instance)              { -                Creature *temp = Unit::GetCreature(*me, instance->GetData64(DATA_ALYTHESS)); +                Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_ALYTHESS));                  if (temp && temp->isAlive() && !temp->getVictim())                      temp->AI()->AttackStart(who);              } @@ -374,7 +374,7 @@ public:              if (instance)              { -                if (Creature *temp = Unit::GetCreature((*me), instance->GetData64(DATA_SACROLASH))) +                if (Creature* temp = Unit::GetCreature((*me), instance->GetData64(DATA_SACROLASH)))                  {                      if (temp->isDead())                          temp->Respawn(); @@ -406,7 +406,7 @@ public:              if (instance)              { -                Creature *temp = Unit::GetCreature(*me, instance->GetData64(DATA_SACROLASH)); +                Creature* temp = Unit::GetCreature(*me, instance->GetData64(DATA_SACROLASH));                  if (temp && temp->isAlive() && !temp->getVictim())                      temp->AI()->AttackStart(who);              } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index d575b7633cb..57699a34e17 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -122,7 +122,7 @@ public:              return false;          } -        Player const * GetPlayerInMap() const +        Player const* GetPlayerInMap() const          {              Map::PlayerList const& players = instance->GetPlayers(); diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index 22c4da74d44..81f64ce6de0 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -102,7 +102,7 @@ class boss_archaedas : public CreatureScript                      DoCast(minion, SPELL_AWAKEN_VAULT_WALKER, flag);                      minion->CastSpell(minion, SPELL_ARCHAEDAS_AWAKEN, true);                      minion->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); -                    minion->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE); +                    minion->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);                      minion->setFaction(14);                  }              } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index ac26056c6e6..df87eaca5a8 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -205,7 +205,7 @@ class instance_uldaman : public InstanceMapScript                          continue;                      archaedas->CastSpell(target, SPELL_AWAKEN_VAULT_WALKER, true);                      target->CastSpell(target, SPELL_ARCHAEDAS_AWAKEN, true); -                    target->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE); +                    target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);                      target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);                      target->setFaction(14);                      return;        // only want the first one we find diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 59997ebaa31..44fa0f87177 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -314,7 +314,7 @@ class npc_harrison_jones : public CreatureScript                      me->SetEntry(NPC_HARRISON_JONES_2);                      me->SetDisplayId(MODEL_HARRISON_JONES_2);                      me->SetTarget(0); -                    me->SetByteValue(UNIT_FIELD_BYTES_1,0,UNIT_STAND_STATE_DEAD); +                    me->SetByteValue(UNIT_FIELD_BYTES_1, 0,UNIT_STAND_STATE_DEAD);                      me->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD);                      if (instance)                          instance->SetData(DATA_GONGEVENT, DONE); @@ -330,7 +330,7 @@ class npc_harrison_jones : public CreatureScript                          switch (_gongEvent)                          {                              case GONG_EVENT_1: -                                me->GetMotionMaster()->MovePath(HARRISON_MOVE_1,false); +                                me->GetMotionMaster()->MovePath(HARRISON_MOVE_1, false);                                  _gongEvent = GONG_EVENT_2;                                  _gongTimer = 12000;                                  break; @@ -345,14 +345,14 @@ class npc_harrison_jones : public CreatureScript                                  break;                              case GONG_EVENT_3:                                  if (GameObject* gong = me->GetMap()->GetGameObject(instance->GetData64(GO_STRANGE_GONG))) -                                    gong->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_NOT_SELECTABLE); +                                    gong->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);                                  _gongEvent = GONG_EVENT_4;                                  _gongTimer = 105000;                                  break;                              case GONG_EVENT_4:                                  me->RemoveAura(SPELL_BANGING_THE_GONG);                                  if (GameObject* gong = me->GetMap()->GetGameObject(instance->GetData64(GO_STRANGE_GONG))) -                                    gong->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_NOT_SELECTABLE); +                                    gong->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);                                  // trigger or gong will need to be scripted to set IN_PROGRESS after enough hits.                                  // This is temp workaround. @@ -362,7 +362,7 @@ class npc_harrison_jones : public CreatureScript                                  if (instance->GetData(DATA_GONGEVENT) == IN_PROGRESS)                                  {                                      // Players are Now Saved to instance at SPECIAL (Player should be notified?) -                                    me->GetMotionMaster()->MovePath(HARRISON_MOVE_2,false); +                                    me->GetMotionMaster()->MovePath(HARRISON_MOVE_2, false);                                      _gongEvent = GONG_EVENT_5;                                      _gongTimer = 5000;                                  } @@ -401,12 +401,12 @@ class npc_harrison_jones : public CreatureScript                                                      ptarget->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 0, uint32(WEAPON_SPEAR));                                                      ptarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);                                                      ptarget->SetReactState(REACT_PASSIVE); -                                                    ptarget->AI()->SetData(0,1); +                                                    ptarget->AI()->SetData(0, 1);                                                  }                                                  else                                                      ptarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);                                                      ptarget->SetReactState(REACT_PASSIVE); -                                                    ptarget->AI()->SetData(0,2); +                                                    ptarget->AI()->SetData(0, 2);                                              }                                          }                                      } @@ -421,7 +421,7 @@ class npc_harrison_jones : public CreatureScript                                  DoCast(me, SPELL_STEALTH);                                  me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 0, uint32(0));                                  me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); -                                me->GetMotionMaster()->MovePath(HARRISON_MOVE_3,false); +                                me->GetMotionMaster()->MovePath(HARRISON_MOVE_3, false);                                  _gongTimer = 1000;                                  _gongEvent = 0;                                  break; | 
