aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent-Michael <vincent_michael@gmx.de>2016-09-22 21:59:12 +0200
committerVincent-Michael <vincent_michael@gmx.de>2016-09-22 21:59:12 +0200
commit1f6c32447646c4efd16fa3b539a5922e526ba8be (patch)
treedfd70516ccef49466562e26385a8b1a73df2a37c
parent9e825824a49602e0b951813b0b7611da12b022c1 (diff)
Core/Misc: Whitespace cleanup
-rw-r--r--src/server/game/Battlefield/Zones/BattlefieldTB.h18
-rw-r--r--src/server/scripts/Commands/cs_npc.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp2
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp4
4 files changed, 13 insertions, 13 deletions
diff --git a/src/server/game/Battlefield/Zones/BattlefieldTB.h b/src/server/game/Battlefield/Zones/BattlefieldTB.h
index 06182c78e61..2c5e6423a79 100644
--- a/src/server/game/Battlefield/Zones/BattlefieldTB.h
+++ b/src/server/game/Battlefield/Zones/BattlefieldTB.h
@@ -51,7 +51,7 @@ enum TolBaradSpells
SPELL_REWARD_TOWER_INTACT = 89794,
SPELL_REWARD_TOWER_DAMAGED = 89795,
SPELL_REWARD_TOWER_DESTROYED = 89796,
-
+
// Player buffs
SPELL_TB_SLOW_FALL = 88473,
SPELL_TB_VETERAN = 84655,
@@ -64,7 +64,7 @@ enum TolBaradSpells
SPELL_RIDE_TOL_BARAD_VEHICLE = 84754,
SPELL_DEPLOY_SIEGE_MODE = 84974,
SPELL_SIEGE_CANNON_AURA = 85167, // aura, periodically triggers spell 85122
-// SPELL_SIEGE_CANNON_EFFECT = 85122, // targets random
+// SPELL_SIEGE_CANNON_EFFECT = 85122, // targets random
// SPELL_SIEGE_CANNON_DAMAGE = 85125,
SPELL_LEAVE_SIEGE_MODE = 85078,
@@ -109,7 +109,7 @@ enum TolBaradNpcs
NPC_TB_GY_SPIRIT_WARDENS_VIGIL_A = 45069,
NPC_TB_GY_SPIRIT_EAST_SPIRE_A = 45070,
NPC_TB_GY_SPIRIT_SOUTH_SPIRE_A = 45071,
- NPC_TB_GY_SPIRIT_WEST_SPIRE_A = 45072,
+ NPC_TB_GY_SPIRIT_WEST_SPIRE_A = 45072,
NPC_TB_GY_SPIRIT_SLAGWORKS_A = 45073,
NPC_TB_GY_SPIRIT_IRONCLAD_GARRISON_H = 45074,
NPC_TB_GY_SPIRIT_WARDENS_VIGIL_H = 45075,
@@ -165,7 +165,7 @@ enum TolBaradWorldStates
TB_WS_HORDE_CONTROLS_SHOW = 5384,
TB_WS_ALLIANCE_ATTACKING_SHOW = 5546,
TB_WS_HORDE_ATTACKING_SHOW = 5547,
-
+
TB_WS_BUILDINGS_CAPTURED = 5348,
TB_WS_BUILDINGS_CAPTURED_SHOW = 5349,
TB_WS_TOWERS_DESTROYED = 5347,
@@ -263,7 +263,7 @@ enum TolBaradText
TB_TEXT_SLAGWORKS_ALLIANCE_GAINED = 15,
TB_TEXT_SLAGWORKS_ALLIANCE_LOST = 16,
TB_TEXT_SLAGWORKS_HORDE_GAINED = 17,
- TB_TEXT_SLAGWORKS_HORDE_LOST = 18,
+ TB_TEXT_SLAGWORKS_HORDE_LOST = 18,
TB_TEXT_FORTRESS_DEFEND_ALLIANCE = 19,
TB_TEXT_FORTRESS_DEFEND_HORDE = 20,
TB_TEXT_FORTRESS_CAPTURE_ALLIANCE = 21,
@@ -298,7 +298,7 @@ enum TBQuestInfantryEntry
NPC_HORDE_SHAMAN_INFANTRY = 47610,
};
-uint32 const TB_QUEST_INFANTRY[BG_TEAMS_COUNT][4] =
+uint32 const TB_QUEST_INFANTRY[BG_TEAMS_COUNT][4] =
{
{ NPC_HORDE_DRUID_INFANTRY, NPC_HORDE_MAGE_INFANTRY, NPC_HORDE_ROGUE_INFANTRY, NPC_HORDE_SHAMAN_INFANTRY },
{ NPC_ALLIANCE_WARRIOR_INFANTRY, NPC_ALLIANCE_PALADIN_INFANTRY, NPC_ALLIANCE_HUNTER_INFANTRY, NPC_ALLIANCE_MAGE_INFANTRY },
@@ -476,7 +476,7 @@ struct TBCapturePointSpawnData
uint32 textGained[2];
uint32 textLost[2];
};
-
+
TBCapturePointSpawnData const TBCapturePoints[TB_BASE_COUNT] =
{
{ -896.96f, 979.497f, 121.441f, 3.124123f, TB_BASE_IRONCLAD_GARRISON, { GO_CAPTURE_POINT_NORTH_A_DEFENDING, GO_CAPTURE_POINT_NORTH_H_DEFENDING }, { TB_WS_GARRISON_ALLIANCE_CONTROLLED, TB_WS_GARRISON_HORDE_CONTROLLED }, { TB_WS_GARRISON_ALLIANCE_CAPTURING, TB_WS_GARRISON_HORDE_CAPTURING }, TB_WS_GARRISON_NEUTRAL, { TB_TEXT_GARRISON_ALLIANCE_GAINED, TB_TEXT_GARRISON_HORDE_GAINED }, { TB_TEXT_GARRISON_ALLIANCE_LOST, TB_TEXT_GARRISON_HORDE_LOST } },
@@ -704,7 +704,7 @@ class TC_GAME_API BattlefieldTB : public Battlefield
bool updatedNPCAndObjects;
uint32 m_updateObjectsTimer;
-
+
uint32 m_BonusTime;
GuidSet BattleInactiveNPCs;
@@ -713,7 +713,7 @@ class TC_GAME_API BattlefieldTB : public Battlefield
GuidSet TemporaryNPCs;
GuidSet TemporaryGOs;
- GuidSet Towers;
+ GuidSet Towers;
uint8 m_iCellblockRandom;
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index 54eb7867c34..cdd5d703de7 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -1487,7 +1487,7 @@ public:
why = CreatureAI::EVADE_REASON_SEQUENCE_BREAK;
else if (stricmp(type_str, "FORCE") == 0)
force = true;
-
+
if (!force && force_str)
if (stricmp(force_str, "FORCE") == 0)
force = true;
diff --git a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp
index 123d4102794..522a7d7ba11 100644
--- a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp
+++ b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp
@@ -380,7 +380,7 @@ void AddEasternKingdomsScripts()
AddSC_stranglethorn_vale();
AddSC_swamp_of_sorrows();
AddSC_tirisfal_glades();
- AddSC_tol_barad();
+ AddSC_tol_barad();
AddSC_undercity();
AddSC_western_plaguelands();
AddSC_wetlands();
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index 0689a0fe216..54ee98d6adb 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -389,7 +389,7 @@ class boss_high_astromancer_solarian : public CreatureScript
else
VoidBolt_Timer -= diff;
}
-
+
//When Solarian reaches 20% she will transform into a huge void walker.
if (Phase != 4 && me->HealthBelowPct(20))
{
@@ -403,7 +403,7 @@ class boss_high_astromancer_solarian : public CreatureScript
me->SetDisplayId(MODEL_VOIDWALKER);
me->SetObjectScale(defaultsize*2.5f);
}
-
+
DoMeleeAttackIfReady();
}
};