From 47d7f7be1c919e380d7938a05dde208ae100a554 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 9 Sep 2018 16:41:58 +0200 Subject: [PATCH] kill whitespaces --- src/server/game/DataStores/DBCStructure.h | 2 +- src/server/game/Entities/Creature/Creature.cpp | 6 +++--- src/server/game/Maps/Map.cpp | 2 +- src/server/game/Maps/Map.h | 2 +- src/server/game/Maps/SpawnData.h | 2 +- src/server/game/Skills/Archaeology/ArchaeologySites.cpp | 8 ++++---- src/server/scripts/Commands/cs_account.cpp | 2 +- .../CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp | 4 ++-- src/server/scripts/Spells/spell_generic.cpp | 2 +- src/server/scripts/Spells/spell_item.cpp | 8 ++++---- src/server/scripts/Spells/spell_mage.cpp | 2 +- src/tools/mmaps_generator/MapBuilder.cpp | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index 362c583bb8..cab0f1a3bf 100644 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -692,7 +692,7 @@ struct AreaTriggerEntry float x; // 2 m_x float y; // 3 m_y float z; // 4 m_z - uint32 PhaseUseFlags; // 5 PhaseUseFlags + uint32 PhaseUseFlags; // 5 PhaseUseFlags uint32 PhaseID; // 6 PhaseID uint32 PhaseGroupID; // 7 PhaseGroupID float radius; // 8 m_radius diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index b00f8c342e..54aacbd402 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -232,7 +232,7 @@ void Creature::AddToWorld() AIM_Initialize(); if (IsVehicle()) GetVehicleKit()->Install(); - + if (GetZoneScript()) GetZoneScript()->OnCreatureCreate(this); } @@ -624,7 +624,7 @@ void Creature::Update(uint32 diff) if (m_shouldReacquireTarget && !IsFocusing(nullptr, true)) { SetTarget(m_suppressedTarget); - + if (!HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_DISABLE_TURN)) { if (m_suppressedTarget) @@ -2892,7 +2892,7 @@ void Creature::FocusTarget(Spell const* focusSpell, WorldObject const* target) } bool const noTurnDuringCast = spellInfo->HasAttribute(SPELL_ATTR5_DONT_TURN_DURING_CAST); - + if (!HasFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_DISABLE_TURN)) { // Face the target - we need to do this before the unit state is modified for no-turn spells diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index a3ee6a7e91..b5efd7a2a2 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3124,7 +3124,7 @@ void Map::AddRespawnInfo(RespawnInfo& info, bool replace) return; RespawnInfoMap& bySpawnIdMap = GetRespawnMapForType(info.type); - + auto it = bySpawnIdMap.find(info.spawnId); if (it != bySpawnIdMap.end()) // spawnid already has a respawn scheduled { diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index b871299271..d258d7ec83 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -783,7 +783,7 @@ class TC_GAME_API Map : public GridRefManager if (RespawnInfo* info = GetRespawnInfo(type, spawnId)) DeleteRespawnInfo(info); } - + public: void GetRespawnInfo(std::vector& respawnData, SpawnObjectTypeMask types, uint32 zoneId = 0) const; RespawnInfo* GetRespawnInfo(SpawnObjectType type, ObjectGuid::LowType spawnId) const; diff --git a/src/server/game/Maps/SpawnData.h b/src/server/game/Maps/SpawnData.h index 24843ef043..cc6d049647 100644 --- a/src/server/game/Maps/SpawnData.h +++ b/src/server/game/Maps/SpawnData.h @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ - + #ifndef TRINITY_SPAWNDATA_H #define TRINITY_SPAWNDATA_H diff --git a/src/server/game/Skills/Archaeology/ArchaeologySites.cpp b/src/server/game/Skills/Archaeology/ArchaeologySites.cpp index 491fd20b99..0ed8d83652 100644 --- a/src/server/game/Skills/Archaeology/ArchaeologySites.cpp +++ b/src/server/game/Skills/Archaeology/ArchaeologySites.cpp @@ -120,7 +120,7 @@ void Archaeology::UseSite() float o = _player->GetOrientation(); float x = _player->GetPositionX() + cos(o) * 2.0f; float y = _player->GetPositionY() + sin(o) * 2.0f; - float z = _player->GetPositionZ(); + float z = _player->GetPositionZ(); float ground = _player->GetMap()->GetWaterOrGroundLevel(_player->GetPhaseShift(), x, y, z, &ground, _player->IsInWater()); QuaternionData rot = QuaternionData::fromEulerAnglesZYX(angle, 0.f, 0.f); @@ -176,10 +176,10 @@ Continent Archaeology::GetContinent() uint32 Archaeology::GetNearestSite(float &distance) { uint32 cont = GetContinent(); - + if (COUNT_CONT == cont) return 0; - + uint32 position = cont * CONTINENT_SITES; float pX = _player->GetPositionX(); @@ -238,7 +238,7 @@ void Archaeology::RegenerateContinent(Continent continent) } uint32 position = continent * CONTINENT_SITES; - + for (uint32 i = 0; i < CONTINENT_SITES; i++) RegeneratePosition(position + i, continent); } diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp index 84c8bb5bde..b8daa62001 100644 --- a/src/server/scripts/Commands/cs_account.cpp +++ b/src/server/scripts/Commands/cs_account.cpp @@ -492,7 +492,7 @@ public: handler->SetSentErrorMessage(true); return false; } - + } else { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index b6de41d6de..ba5fb4df83 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -616,7 +616,7 @@ public: DoMeleeAttackIfReady(); } }; - + CreatureAI* GetAI(Creature* creature) const override { return GetHyjalAI(creature); @@ -1437,7 +1437,7 @@ public: DoMeleeAttackIfReady(); } }; - + CreatureAI* GetAI(Creature* creature) const override { return GetHyjalAI(creature); diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 50b182c93d..f73c2225b7 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -1784,7 +1784,7 @@ class spell_ethereal_pet_aura : public AuraScript GetUnitOwner()->GetAllMinionsByEntry(minionList, NPC_ETHEREAL_SOUL_TRADER); for (Creature* minion : minionList) { - if (minion->IsAIEnabled) + if (minion->IsAIEnabled) { minion->AI()->Talk(SAY_STEAL_ESSENCE); minion->CastSpell(eventInfo.GetProcTarget(), SPELL_STEAL_ESSENCE_VISUAL); diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index e3f3a06873..9ddaa0ecb5 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -301,7 +301,7 @@ enum AuraOfMadness SAY_MADNESS = 21954 }; -// Item - 31859: Darkmoon Card: Madness +// Item - 31859: Darkmoon Card: Madness // 39446 - Aura of Madness class spell_item_aura_of_madness : public SpellScriptLoader { @@ -1113,7 +1113,7 @@ class spell_item_gnomish_death_ray : public SpellScriptLoader } }; -// Item 10721: Gnomish Harm Prevention Belt +// Item 10721: Gnomish Harm Prevention Belt // 13234 - Harm Prevention Belt enum HarmPreventionBelt { @@ -1371,8 +1371,8 @@ enum MarkOfConquest SPELL_MARK_OF_CONQUEST_ENERGIZE = 39599 }; -// Item - 27920: Mark of Conquest -// Item - 27921: Mark of Conquest +// Item - 27920: Mark of Conquest +// Item - 27921: Mark of Conquest // 33510 - Health Restore class spell_item_mark_of_conquest : public SpellScriptLoader { diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index b6cd8a0f4b..74b0bc8f46 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -1573,7 +1573,7 @@ public: SPELL_MAGE_ARCANE_MISSILES_DAMAGE, SPELL_MAGE_ARCANE_BLAST }); - + } bool CheckProc(ProcEventInfo& eventInfo) diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index 5cc935d694..1c5b733f43 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -843,7 +843,7 @@ namespace MMAP // DT_TILE_FREE_DATA tells detour to unallocate memory when the tile // is removed via removeTile() dtStatus dtResult = navMesh->addTile(navData, navDataSize, DT_TILE_FREE_DATA, 0, &tileRef); - + if (!tileRef || dtResult != DT_SUCCESS) { printf("%s Failed adding tile to navmesh! \n", tileString.c_str());