diff options
author | sirikfoll <sirikfoll@hotmail.com> | 2017-08-11 23:06:37 -0300 |
---|---|---|
committer | sirikfoll <sirikfoll@hotmail.com> | 2017-08-11 23:06:37 -0300 |
commit | e2565c2597a72ea7868eef3156014dc3a83c058f (patch) | |
tree | 9728ede6f4f0bf8a09408b00166979134bf29922 | |
parent | 7fff83d67526efff63867d41b9e036a19a9287b3 (diff) |
Core/Misc: Remove Whitespaces
20 files changed, 29 insertions, 29 deletions
diff --git a/src/common/Collision/Management/IVMapManager.h b/src/common/Collision/Management/IVMapManager.h index 0371135cfa5..c32bb2d41e5 100644 --- a/src/common/Collision/Management/IVMapManager.h +++ b/src/common/Collision/Management/IVMapManager.h @@ -66,7 +66,7 @@ namespace VMAP uint32 const type; float const level; }; - + float floorZ = VMAP_INVALID_HEIGHT; Optional<AreaInfo> areaInfo; Optional<LiquidInfo> liquidInfo; diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp index 7c894efa1ca..8140a66c61c 100644 --- a/src/common/Collision/Management/VMapManager2.cpp +++ b/src/common/Collision/Management/VMapManager2.cpp @@ -303,7 +303,7 @@ namespace VMAP if (!reqLiquidType || (GetLiquidFlagsPtr(liquidType) & reqLiquidType)) if (info.hitInstance->GetLiquidLevel(pos, info, liquidLevel)) data.liquidInfo = boost::in_place(liquidType, liquidLevel); - + if (!IsVMAPDisabledForPtr(mapId, VMAP_DISABLE_AREAFLAG)) data.areaInfo = boost::in_place(info.hitInstance->adtId, info.rootId, info.hitModel->GetWmoID(), info.hitModel->GetMogpFlags()); } diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp index 8211f4d6151..e818df4e8fb 100644 --- a/src/common/Debugging/WheatyExceptionReport.cpp +++ b/src/common/Debugging/WheatyExceptionReport.cpp @@ -827,7 +827,7 @@ PVOID UserContext) { ClearSymbols(); FormatSymbolValue(pSymInfo, (STACKFRAME64*)UserContext); - + } __except (EXCEPTION_EXECUTE_HANDLER) { diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 0e01304a9e4..9a5aba738ee 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1655,7 +1655,7 @@ void Creature::DeleteFromDB() // remove any scheduled respawns GetMap()->RemoveRespawnTime(SPAWN_TYPE_CREATURE, m_spawnId); - + // delete data from memory sObjectMgr->DeleteCreatureData(m_spawnId); @@ -1950,7 +1950,7 @@ void Creature::Respawn(bool force) if (IsAIEnabled) // reset the AI to be sure no dirty or uninitialized values will be used till next tick AI()->Reset(); - + m_triggerJustAppeared = true; uint32 poolid = GetSpawnId() ? sPoolMgr->IsPartOfAPool<Creature>(GetSpawnId()) : 0; diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 3717b16280e..ce9658ef37e 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1028,7 +1028,7 @@ void GameObject::DeleteFromDB() stmt = WorldDatabase.GetPreparedStatement(WORLD_DEL_EVENT_GAMEOBJECT); stmt->setUInt32(0, m_spawnId); trans->Append(stmt); - + WorldDatabase.CommitTransaction(trans); } diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index c445f53190c..9252efa9ed6 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -24058,7 +24058,7 @@ void Player::ProcessTerrainStatusUpdate(ZLiquidStatus status, Optional<LiquidDat else m_MirrorTimerFlags &= ~UNDERWATER_INLAVA; } - + // Slime state (any contact) if (liquidData->type_flags & MAP_LIQUID_TYPE_SLIME) { diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index b096dfbba80..8fbbbdceda5 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -2226,7 +2226,7 @@ void ObjectMgr::LoadSpawnGroupTemplates() group.isActive = !(group.flags & SPAWNGROUP_FLAG_MANUAL_SPAWN); } while (result->NextRow()); } - + if (_spawnGroupDataStore.find(0) == _spawnGroupDataStore.end()) { TC_LOG_ERROR("server.loading", "Default spawn group (index 0) is missing from DB! Manually inserted."); @@ -2354,7 +2354,7 @@ void ObjectMgr::LoadInstanceSpawnGroups() InstanceSpawnGroupInfo& info = vector.back(); info.SpawnGroupId = spawnGroupId; info.BossStateId = fields[1].GetUInt8(); - + uint8 const ALL_STATES = (1 << TO_BE_DECIDED) - 1; uint8 const states = fields[2].GetUInt8(); if (states & ~ALL_STATES) @@ -2373,7 +2373,7 @@ void ObjectMgr::LoadInstanceSpawnGroups() } else info.Flags = flags; - + ++n; } while (result->NextRow()); diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index acbe5e641e8..218e856742e 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -933,9 +933,9 @@ namespace Trinity return false; float searchRadius = i_range; - if (i_incOwnRadius) + if (i_incOwnRadius) searchRadius += i_obj->GetCombatReach(); - if (i_incTargetRadius) + if (i_incTargetRadius) searchRadius += u->GetCombatReach(); if (!u->IsInMap(i_obj) || !u->InSamePhase(i_obj) || !u->IsWithinDoubleVerticalCylinder(i_obj, searchRadius, searchRadius)) @@ -959,7 +959,7 @@ namespace Trinity class AnyGroupedUnitInObjectRangeCheck { public: - AnyGroupedUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range, bool raid, bool playerOnly = false, bool incOwnRadius = true, bool incTargetRadius = true) + AnyGroupedUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range, bool raid, bool playerOnly = false, bool incOwnRadius = true, bool incTargetRadius = true) : _source(obj), _refUnit(funit), _range(range), _raid(raid), _playerOnly(playerOnly), i_incOwnRadius(incOwnRadius), i_incTargetRadius(incTargetRadius) { } bool operator()(Unit* u) const @@ -982,9 +982,9 @@ namespace Trinity return false; float searchRadius = _range; - if (i_incOwnRadius) + if (i_incOwnRadius) searchRadius += _source->GetCombatReach(); - if (i_incTargetRadius) + if (i_incTargetRadius) searchRadius += u->GetCombatReach(); return u->IsInMap(_source) && u->InSamePhase(_source) && u->IsWithinDoubleVerticalCylinder(_source, searchRadius, searchRadius); @@ -1069,9 +1069,9 @@ namespace Trinity return false; float searchRadius = i_range; - if (i_incOwnRadius) + if (i_incOwnRadius) searchRadius += i_obj->GetCombatReach(); - if (i_incTargetRadius) + if (i_incTargetRadius) searchRadius += u->GetCombatReach(); return u->IsInMap(i_obj) && u->InSamePhase(i_obj) && u->IsWithinDoubleVerticalCylinder(i_obj, searchRadius, searchRadius); diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 7b7872ad8ad..db6a5c2a2e3 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3067,7 +3067,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 7488e8660ac..162e3fe7db5 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -772,7 +772,7 @@ class TC_GAME_API Map : public GridRefManager<NGridType> if (RespawnInfo* info = GetRespawnInfo(type, spawnId)) DeleteRespawnInfo(info); } - + public: void GetRespawnInfo(RespawnVector& 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 700311e64c7..8e56c0bb73d 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 <http://www.gnu.org/licenses/>. */ - + #ifndef TRINITY_SPAWNDATA_H #define TRINITY_SPAWNDATA_H diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 42fe5d29600..5b4a767b5b4 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -3209,7 +3209,7 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex) // Mangle (Cat): CP if (m_spellInfo->SpellFamilyFlags[1] & 0x400) AddComboPointGain(unitTarget, 1); - + // Shred, Maul - Rend and Tear else if (m_spellInfo->SpellFamilyFlags[0] & 0x00008800 && unitTarget->HasAuraState(AURA_STATE_BLEEDING)) { diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 3a0aeba72d1..7cf81b2fedf 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1705,7 +1705,7 @@ void World::SetInitialWorldSettings() TC_LOG_INFO("server.loading", "Loading Spawn Group Templates..."); sObjectMgr->LoadSpawnGroupTemplates(); - + TC_LOG_INFO("server.loading", "Loading instance spawn groups..."); sObjectMgr->LoadInstanceSpawnGroups(); diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index 8beb5faacde..3a241fcd95e 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -94,7 +94,7 @@ if (USE_SCRIPTPCH) set(PRIVATE_PCH_SOURCE ScriptPCH.cpp) if (MSVC) list(INSERT PRIVATE_SOURCES 0 ScriptPCH.cpp) - endif (MSVC) + endif (MSVC) endif () GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index 2b8f89da7ac..7d0563b2acc 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -274,7 +274,7 @@ public: handler->SetSentErrorMessage(true); return false; } - + if (!MapManager::IsValidMapCoord(goData->spawnPoint) || sObjectMgr->IsTransportMap(goData->spawnPoint.GetMapId())) { handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, goData->spawnPoint.GetPositionX(), goData->spawnPoint.GetPositionY(), goData->spawnPoint.GetMapId()); diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index dbf50d65640..0b51b8b167c 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -548,7 +548,7 @@ public: Player* targetGroupLeader = nullptr; if (Group* targetGroup = target->GetGroup()) targetGroupLeader = ObjectAccessor::GetPlayer(map, targetGroup->GetLeaderGUID()); - + // check if far teleport is allowed if (!targetGroupLeader || (targetGroupLeader->GetMapId() != map->GetId()) || (targetGroupLeader->GetInstanceId() != map->GetInstanceId())) if ((targetMap->GetId() != map->GetId()) || (targetMap->GetInstanceId() != map->GetInstanceId())) diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 0f571dda0c4..968b0cd0f61 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -687,7 +687,7 @@ public: switch (ExecuteSpeech_Counter) { - case 0: + case 0: Talk(SAY_EXEC_START, player); break; case 1: diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h index ae1323af6aa..57d738698c7 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h @@ -33,7 +33,7 @@ enum ZADataTypes BOSS_HEXLORD = 4, BOSS_ZULJIN = 5, MAX_ENCOUNTER, - + DATA_GONGEVENT, DATA_CHESTLOOTED, TYPE_RAND_VENDOR_1, diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index 93ccba1dc0a..860b4a38968 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -1196,7 +1196,7 @@ public: return false; AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); SendGossipMenuFor(player, 907, me->GetGUID()); - break; + break; } case 1: AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_ITEM_ARTHAS_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index ac7bb108a54..fb2e461da0e 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -114,7 +114,7 @@ void AggroAllPlayers(Creature* temp) temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); temp->SetImmuneToPC(true); temp->SetReactState(REACT_AGGRESSIVE); - temp->EngageWithTarget(player); + temp->EngageWithTarget(player); } } } |