diff options
| author | Kargatum <dowlandtop@yandex.com> | 2021-01-03 17:47:07 +0700 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-05 20:07:57 +0100 |
| commit | 373ed8f46bef3fda0ffc2c4e2b6d39527d595c8e (patch) | |
| tree | 9580280f271db59e2abdb26094ab99ec43354a18 /src/server/game | |
| parent | 05a9b2d2cb40df7daedbce2712609f6bab9ad0e1 (diff) | |
Core: whitespace cleanup, reduce double blank line to single (#25795)
* Core/Misc: fix double empty line
* worldserver.conf
(cherry picked from commit a32b6b8ac4c81128a56b282f20837fb085bdd9e7)
Diffstat (limited to 'src/server/game')
43 files changed, 0 insertions, 61 deletions
diff --git a/src/server/game/AI/SelectableAI.h b/src/server/game/AI/SelectableAI.h index fc6ec88af5c..7af625489da 100644 --- a/src/server/game/AI/SelectableAI.h +++ b/src/server/game/AI/SelectableAI.h @@ -42,5 +42,4 @@ private: bool _isDBAllowed; }; - #endif // SelectableAI_h__ diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 473986a4a97..4df54896558 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -2551,7 +2551,6 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u ENSURE_AI(SmartAI, summon->AI())->SetTimedActionList(e, e.entryOrGuid, privateObjectOwner, e.event_id + 1); }; - // if target is position then targets container was empty if (e.GetTargetType() != SMART_TARGET_POSITION) { diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index 0fdd6d32117..9d6dd05f0f2 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -1959,7 +1959,6 @@ void AuctionHouseObject::SendAuctionExpired(AuctionPosting const* auction, Chara if (owner) owner->GetSession()->SendAuctionClosedNotification(auction, 0.0f, false); - auto itemItr = auction->Items.begin(); while (itemItr != auction->Items.end()) { diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index d25aa60c799..023a8a514bf 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -187,7 +187,6 @@ bool Battlefield::Update(uint32 diff) objective_changed = true; } - if (m_LastResurrectTimer <= diff) { for (uint8 i = 0; i < m_GraveyardList.size(); i++) diff --git a/src/server/game/Battlegrounds/ArenaTeam.h b/src/server/game/Battlegrounds/ArenaTeam.h index 29a62ab442e..c3815492274 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.h +++ b/src/server/game/Battlegrounds/ArenaTeam.h @@ -169,9 +169,6 @@ class TC_GAME_API ArenaTeam void MemberLost(Player* player, uint32 againstMatchmakerRating, int32 MatchmakerRatingChange = -12); void OfflineMemberLost(ObjectGuid guid, uint32 againstMatchmakerRating, int32 MatchmakerRatingChange = -12); - - - bool FinishWeek(); // returns true if arena team played this week void FinishGame(int32 mod); diff --git a/src/server/game/BlackMarket/BlackMarketMgr.cpp b/src/server/game/BlackMarket/BlackMarketMgr.cpp index 8faf1f434cc..068569050bf 100644 --- a/src/server/game/BlackMarket/BlackMarketMgr.cpp +++ b/src/server/game/BlackMarket/BlackMarketMgr.cpp @@ -496,7 +496,6 @@ void BlackMarketEntry::PlaceBid(uint64 bid, Player* player, CharacterDatabaseTra player->ModifyMoney(-static_cast<int64>(bid)); - CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_BLACKMARKET_AUCTIONS); stmt->setUInt64(0, _currentBid); diff --git a/src/server/game/Cache/CharacterCache.cpp b/src/server/game/Cache/CharacterCache.cpp index 277d552143f..3f10198cfd3 100644 --- a/src/server/game/Cache/CharacterCache.cpp +++ b/src/server/game/Cache/CharacterCache.cpp @@ -198,7 +198,6 @@ void CharacterCache::UpdateCharacterInfoDeleted(ObjectGuid const& guid, bool del itr->second.Name = *name; } - /* Getters */ diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h index 4465acd85ed..5e671d980fa 100644 --- a/src/server/game/Chat/Channels/Channel.h +++ b/src/server/game/Chat/Channels/Channel.h @@ -252,7 +252,6 @@ class TC_GAME_API Channel bool IsOn(ObjectGuid who) const { return _playersStore.find(who) != _playersStore.end(); } bool IsBanned(ObjectGuid guid) const { return _bannedStore.find(guid) != _bannedStore.end(); } - uint8 GetPlayerFlags(ObjectGuid const& guid) const { PlayerContainer::const_iterator itr = _playersStore.find(guid); diff --git a/src/server/game/Chat/ChatCommands/ChatCommand.cpp b/src/server/game/Chat/ChatCommands/ChatCommand.cpp index d9c56042ef1..e8ad13355aa 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommand.cpp +++ b/src/server/game/Chat/ChatCommands/ChatCommand.cpp @@ -488,4 +488,3 @@ void Trinity::ChatCommands::InvalidateCommandMap() { Trinity::Impl::ChatCommands bool Trinity::ChatCommands::TryExecuteCommand(ChatHandler& handler, std::string_view cmd) { return Trinity::Impl::ChatCommands::ChatCommandNode::TryExecuteCommand(handler, cmd); } void Trinity::ChatCommands::SendCommandHelpFor(ChatHandler& handler, std::string_view cmd) { Trinity::Impl::ChatCommands::ChatCommandNode::SendCommandHelpFor(handler, cmd); } std::vector<std::string> Trinity::ChatCommands::GetAutoCompletionsFor(ChatHandler const& handler, std::string_view cmd) { return Trinity::Impl::ChatCommands::ChatCommandNode::GetAutoCompletionsFor(handler, cmd); } - diff --git a/src/server/game/Combat/CombatManager.h b/src/server/game/Combat/CombatManager.h index 8dc3aef83c9..d945c44a412 100644 --- a/src/server/game/Combat/CombatManager.h +++ b/src/server/game/Combat/CombatManager.h @@ -137,7 +137,6 @@ class TC_GAME_API CombatManager std::unordered_map<ObjectGuid, CombatReference*> _pveRefs; std::unordered_map<ObjectGuid, PvPCombatReference*> _pvpRefs; - friend struct CombatReference; friend struct PvPCombatReference; }; diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index dd3f03090ae..d2cc4e94848 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -2992,7 +2992,6 @@ bool ConditionMgr::IsPlayerMeetingCondition(Player const* player, PlayerConditio return false; } - if (condition->SpellID[0]) { std::array<bool, std::tuple_size_v<decltype(condition->SpellID)>> results; diff --git a/src/server/game/DataStores/DB2HotfixGenerator.h b/src/server/game/DataStores/DB2HotfixGenerator.h index 3ea51acfee6..cd7c48c66bc 100644 --- a/src/server/game/DataStores/DB2HotfixGenerator.h +++ b/src/server/game/DataStores/DB2HotfixGenerator.h @@ -63,7 +63,6 @@ private: } } - DB2Storage<T>& _storage; uint32 _count; }; diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 5d906d761f3..7a5242f2612 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -1743,7 +1743,6 @@ LfgLockMap LFGMgr::GetLockedDungeons(ObjectGuid guid) if (player->GetTeam() == HORDE && ar->quest_H && !player->GetQuestRewardStatus(ar->quest_H)) return LFG_LOCKSTATUS_QUEST_NOT_COMPLETED; - if (ar->item) { if (!player->HasItemCount(ar->item) && (!ar->item2 || !player->HasItemCount(ar->item2))) diff --git a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp index 0c7e15e74ee..dd3599cb791 100644 --- a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp +++ b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp @@ -1000,7 +1000,6 @@ void AreaTrigger::AI_Destroy() _ai.reset(); } - void AreaTrigger::BuildValuesCreate(ByteBuffer* data, Player const* target) const { UF::UpdateFieldFlag flags = GetUpdateFieldFlagsFor(target); diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 10a48914ee0..513137767a4 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2030,7 +2030,6 @@ bool Creature::CanStartAttack(Unit const* who, bool force) const return IsWithinLOSInMap(who); } - bool Creature::CheckNoGrayAggroConfig(uint32 playerLevel, uint32 creatureLevel) const { if (Trinity::XP::GetColorCode(playerLevel, creatureLevel) != XP_GRAY) diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index a5ddbc2f5a1..5f1ba8f1172 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1025,7 +1025,6 @@ void GameObject::Update(uint32 diff) else AddObjectToRemoveList(); - break; } } diff --git a/src/server/game/Entities/Item/ItemTemplate.cpp b/src/server/game/Entities/Item/ItemTemplate.cpp index d81c1a68dc7..fe85585f1af 100644 --- a/src/server/game/Entities/Item/ItemTemplate.cpp +++ b/src/server/game/Entities/Item/ItemTemplate.cpp @@ -98,7 +98,6 @@ uint32 ItemTemplate::GetSkill() const 0, SKILL_CLOTH, SKILL_LEATHER, SKILL_MAIL, SKILL_PLATE_MAIL, 0, SKILL_SHIELD, 0, 0, 0, 0 }; - switch (GetClass()) { case ITEM_CLASS_WEAPON: diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 95b64c80410..b0d182d4497 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -453,7 +453,6 @@ bool Player::Create(ObjectGuid::LowType guidlow, WorldPackets::Character::Charac } } - // set initial homebind position SetHomebind(*this, GetAreaId()); @@ -14118,7 +14117,6 @@ void Player::ApplyEnchantment(Item* item, EnchantmentSlot slot, bool apply, bool if (pEnchant->RequiredSkillID > 0 && pEnchant->RequiredSkillRank > GetSkillValue(pEnchant->RequiredSkillID)) return; - // If we're dealing with a gem inside a prismatic socket we need to check the prismatic socket requirements // rather than the gem requirements itself. If the socket has no color it is a prismatic socket. if ((slot == SOCK_ENCHANTMENT_SLOT || slot == SOCK_ENCHANTMENT_SLOT_2 || slot == SOCK_ENCHANTMENT_SLOT_3)) @@ -16443,7 +16441,6 @@ bool Player::GetQuestRewardStatus(uint32 quest_id) const if (qInfo->IsSeasonal() && !qInfo->IsRepeatable()) return !SatisfyQuestSeasonal(qInfo, false); - // for repeatable quests: rewarded field is set after first reward only to prevent getting XP more than once if (!qInfo->IsRepeatable()) return IsQuestRewarded(quest_id); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 82d829e7c1d..41efb7de14a 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -378,7 +378,6 @@ Unit::Unit(bool isWorldObject) : } m_baseSpellCritChance = 5; - for (uint8 i = 0; i < MAX_MOVE_TYPE; ++i) m_speed_rate[i] = 1.0f; @@ -10911,7 +10910,6 @@ void Unit::SetRooted(bool apply, bool packetOnly /*= false*/) RemoveUnitMovementFlag(MOVEMENTFLAG_ROOT); } - static OpcodeServer const rootOpcodeTable[2][2] = { { SMSG_MOVE_SPLINE_UNROOT, SMSG_MOVE_UNROOT }, diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 146136665ba..655b8f4edaf 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1539,7 +1539,6 @@ class TC_GAME_API Unit : public WorldObject float m_modSpellHitChance; int32 m_baseSpellCritChance; - uint32 m_baseAttackSpeed[MAX_ATTACK]; float m_modAttackSpeedPct[MAX_ATTACK]; uint32 m_attackTimer[MAX_ATTACK]; diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index e2322247ff2..4263522ca45 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -852,7 +852,6 @@ bool VehicleJoinEvent::Execute(uint64, uint32) if (veSeat->HasFlag(VEHICLE_SEAT_FLAG_DISABLE_GRAVITY)) Passenger->SetDisableGravity(true); - float o = veSeatAddon ? veSeatAddon->SeatOrientationOffset : 0.f; float x = veSeat->AttachmentOffset.X; float y = veSeat->AttachmentOffset.Y; diff --git a/src/server/game/Garrison/Garrison.cpp b/src/server/game/Garrison/Garrison.cpp index 6f0ee01d924..22f5d85126d 100644 --- a/src/server/game/Garrison/Garrison.cpp +++ b/src/server/game/Garrison/Garrison.cpp @@ -69,7 +69,6 @@ bool Garrison::LoadFromDB(PreparedQueryResult garrison, PreparedQueryResult blue time_t timeBuilt = fields[2].GetInt64(); bool active = fields[3].GetBool(); - Plot* plot = GetPlot(plotInstanceId); if (!plot) continue; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 8f3bf2ebea2..bb31ea2dcb2 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -7128,7 +7128,6 @@ void ObjectMgr::RemoveGraveyardLink(uint32 id, uint32 zoneId, uint32 team, bool bool found = false; - for (; range.first != range.second; ++range.first) { GraveyardData & data = range.first->second; diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 2d360302223..af7b0182575 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -2201,7 +2201,6 @@ void Group::ResetInstances(uint8 method, bool isRaid, bool isLegacy, Player* Sen CharacterDatabase.Execute(stmt); } - itr = difficultyItr->second.erase(itr); // this unloads the instance save unless online players are bound to it // (eg. permanent binds or GM solo binds) diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index bbbb639d33c..0f79f57358c 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -3511,7 +3511,6 @@ void Guild::SendBankList(WorldSession* session, uint8 tabId, bool fullUpdate) co { WorldPackets::Guild::GuildBankItemInfo& itemInfo = packet.ItemInfo.emplace_back(); - itemInfo.Slot = int32(slotId); itemInfo.Item.ItemID = tabItem->GetEntry(); itemInfo.Count = int32(tabItem->GetCount()); diff --git a/src/server/game/Guilds/GuildMgr.cpp b/src/server/game/Guilds/GuildMgr.cpp index cc7f44bbac3..a95f47e55c9 100644 --- a/src/server/game/Guilds/GuildMgr.cpp +++ b/src/server/game/Guilds/GuildMgr.cpp @@ -361,7 +361,6 @@ void GuildMgr::LoadGuilds() } } - // 8. Load all guild bank tabs TC_LOG_INFO("server.loading", "Loading guild bank tabs..."); { diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp index 0fde80bf5a7..605c2785dea 100644 --- a/src/server/game/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Handlers/BattleGroundHandler.cpp @@ -471,7 +471,6 @@ void WorldSession::HandleRequestBattlefieldStatusOpcode(WorldPackets::Battlegrou if (!bg) continue; - WorldPackets::Battleground::BattlefieldStatusNeedConfirmation battlefieldStatus; sBattlegroundMgr->BuildBattlegroundStatusNeedConfirmation(&battlefieldStatus, bg, _player, i, _player->GetBattlegroundQueueJoinTime(bgQueueTypeId), getMSTimeDiff(getMSTime(), ginfo.RemoveInviteTime), arenaType); SendPacket(battlefieldStatus.Write()); diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp index ab32b381d03..75c259d78f7 100644 --- a/src/server/game/Handlers/SpellHandler.cpp +++ b/src/server/game/Handlers/SpellHandler.cpp @@ -310,7 +310,6 @@ void WorldSession::HandleCastSpellOpcode(WorldPackets::Spells::CastSpell& cast) { bool allow = false; - // allow casting of unknown spells for special lock cases if (GameObject* go = targets.GetGOTarget()) if (go->GetSpellForLock(caster->ToPlayer()) == spellInfo) @@ -557,7 +556,6 @@ void WorldSession::HandleMirrorImageDataRequest(WorldPackets::Spells::GetMirrorI mirrorImageComponentedData.Gender = creator->GetGender(); mirrorImageComponentedData.ClassID = creator->GetClass(); - for (UF::ChrCustomizationChoice const& customization : player->m_playerData->Customizations) mirrorImageComponentedData.Customizations.push_back(customization); diff --git a/src/server/game/Maps/AreaBoundary.cpp b/src/server/game/Maps/AreaBoundary.cpp index 77040434010..b0069da07cd 100644 --- a/src/server/game/Maps/AreaBoundary.cpp +++ b/src/server/game/Maps/AreaBoundary.cpp @@ -31,7 +31,6 @@ bool RectangleBoundary::IsWithinBoundaryArea(Position const* pos) const ); } - // ---== CIRCLE ==--- CircleBoundary::CircleBoundary(Position const& center, double radius, bool isInverted) : AreaBoundary(isInverted), _center(center), _radiusSq(radius*radius) { } @@ -44,7 +43,6 @@ bool CircleBoundary::IsWithinBoundaryArea(Position const* pos) const return offX*offX+offY*offY <= _radiusSq; } - // ---== ELLIPSE ==--- EllipseBoundary::EllipseBoundary(Position const& center, double radiusX, double radiusY, bool isInverted) : AreaBoundary(isInverted), _center(center), _radiusYSq(radiusY*radiusY), _scaleXSq(_radiusYSq / (radiusX*radiusX)) { } @@ -55,7 +53,6 @@ bool EllipseBoundary::IsWithinBoundaryArea(Position const* pos) const return (offX*offX)*_scaleXSq + (offY*offY) <= _radiusYSq; } - // ---== TRIANGLE ==--- TriangleBoundary::TriangleBoundary(Position const& pointA, Position const& pointB, Position const& pointC, bool isInverted) : AreaBoundary(isInverted), _a(pointA), _b(pointB), _c(pointC), _abx(_b.GetDoublePositionX()-_a.GetDoublePositionX()), _bcx(_c.GetDoublePositionX()-_b.GetDoublePositionX()), _cax(_a.GetDoublePositionX() - _c.GetDoublePositionX()), _aby(_b.GetDoublePositionY()-_a.GetDoublePositionY()), _bcy(_c.GetDoublePositionY()-_b.GetDoublePositionY()), _cay(_a.GetDoublePositionY() - _c.GetDoublePositionY()) { } @@ -70,7 +67,6 @@ bool TriangleBoundary::IsWithinBoundaryArea(Position const* pos) const return ((sign1 == sign2) && (sign2 == sign3)); } - // ---== PARALLELOGRAM ==--- ParallelogramBoundary::ParallelogramBoundary(Position const& cornerA, Position const& cornerB, Position const& cornerD, bool isInverted) : AreaBoundary(isInverted), _a(cornerA), _b(cornerB), _d(cornerD), _c(DoublePosition(_d.GetDoublePositionX() + (_b.GetDoublePositionX() - _a.GetDoublePositionX()), _d.GetDoublePositionY() + (_b.GetDoublePositionY() - _a.GetDoublePositionY()))), _abx(_b.GetDoublePositionX() - _a.GetDoublePositionX()), _dax(_a.GetDoublePositionX() - _d.GetDoublePositionX()), _aby(_b.GetDoublePositionY() - _a.GetDoublePositionY()), _day(_a.GetDoublePositionY() - _d.GetDoublePositionY()) { } @@ -86,7 +82,6 @@ bool ParallelogramBoundary::IsWithinBoundaryArea(Position const* pos) const return ((sign1 == sign2) && (sign2 == sign3) && (sign3 == sign4)); } - // ---== Z RANGE ==--- ZRangeBoundary::ZRangeBoundary(float minZ, float maxZ, bool isInverted) : AreaBoundary(isInverted), _minZ(minZ), _maxZ(maxZ) { } @@ -95,7 +90,6 @@ bool ZRangeBoundary::IsWithinBoundaryArea(Position const* pos) const return (_minZ <= pos->GetPositionZ() && pos->GetPositionZ() <= _maxZ); } - // ---== UNION OF 2 BOUNDARIES ==--- BoundaryUnionBoundary::BoundaryUnionBoundary(AreaBoundary const* b1, AreaBoundary const* b2, bool isInverted) : AreaBoundary(isInverted), _b1(b1), _b2(b2) diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 06586100fa0..07d20d19b1f 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -67,7 +67,6 @@ BOOST_1_74_FIBONACCI_HEAP_MSVC_COMPILE_FIX(RespawnListContainer::value_type) GridState* si_GridStates[MAX_GRID_STATE]; - ZoneDynamicInfo::ZoneDynamicInfo() : MusicId(0), DefaultWeather(nullptr), WeatherId(WEATHER_STATE_FINE), Intensity(0.0f) { } diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp index 1b433e04caf..33d36126b6d 100644 --- a/src/server/game/Maps/MapUpdater.cpp +++ b/src/server/game/Maps/MapUpdater.cpp @@ -22,7 +22,6 @@ #include <mutex> - class MapUpdateRequest { private: diff --git a/src/server/game/Miscellaneous/CommonPredicates.h b/src/server/game/Miscellaneous/CommonPredicates.h index b22e89890cc..54040245972 100644 --- a/src/server/game/Miscellaneous/CommonPredicates.h +++ b/src/server/game/Miscellaneous/CommonPredicates.h @@ -66,5 +66,4 @@ namespace Trinity } } - #endif //TRINITY_COMMONPREDICATES_H diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index ef928bdb890..69137fef10c 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -2525,7 +2525,6 @@ enum SpellImmunity MAX_SPELL_IMMUNITY }; - // target enum name consist of: // TARGET_[OBJECT_TYPE]_[REFERENCE_TYPE(skipped for caster)]_[SELECTION_TYPE(skipped for default)]_[additional specifiers(friendly, BACK_LEFT, etc.] enum Targets @@ -7821,7 +7820,6 @@ enum WorldState : uint32 WS_BATTLEFIELD_TB_EAST_INTACT_NEUTRAL = 5451, WS_BATTLEFIELD_TB_EAST_DAMAGED_NEUTRAL = 5452, - WS_CURRENCY_RESET_TIME = 20001, // Next arena distribution time WS_WEEKLY_QUEST_RESET_TIME = 20002, // Next weekly quest reset time WS_BG_DAILY_RESET_TIME = 20003, // Next daily BG reset time diff --git a/src/server/game/Pools/QuestPools.cpp b/src/server/game/Pools/QuestPools.cpp index e60eda8441d..b851109fadd 100644 --- a/src/server/game/Pools/QuestPools.cpp +++ b/src/server/game/Pools/QuestPools.cpp @@ -291,5 +291,3 @@ bool QuestPoolMgr::IsQuestActive(uint32 questId) const return (it->second->activeQuests.find(questId) != it->second->activeQuests.end()); } - - diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 36e0a2addfc..5796a7ebd92 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -94,7 +94,6 @@ enum XPColorChar : uint8; #define VISIBLE_RANGE 166.0f //MAX visible range (size of grid) - /* @todo Add more script type classes. diff --git a/src/server/game/Server/Packets/GuildPackets.h b/src/server/game/Server/Packets/GuildPackets.h index abba85cf2e5..5fb9e2a3dbc 100644 --- a/src/server/game/Server/Packets/GuildPackets.h +++ b/src/server/game/Server/Packets/GuildPackets.h @@ -759,7 +759,6 @@ namespace WorldPackets bool FullUpdate = false; }; - class GuildBankRemainingWithdrawMoneyQuery final : public ClientPacket { public: diff --git a/src/server/game/Server/Packets/PartyPackets.cpp b/src/server/game/Server/Packets/PartyPackets.cpp index 0b1d2aa8e57..bcc6301a3df 100644 --- a/src/server/game/Server/Packets/PartyPackets.cpp +++ b/src/server/game/Server/Packets/PartyPackets.cpp @@ -256,7 +256,6 @@ void WorldPackets::Party::SetPartyAssignment::Read() Set = _worldPacket.ReadBit(); } - void WorldPackets::Party::SetRole::Read() { _worldPacket >> PartyIndex; diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 824872165c8..4fed0e2ba6b 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -1282,7 +1282,6 @@ bool WorldSession::DosProtection::EvaluateOpcode(WorldPacket& p, time_t time) co } } - uint32 WorldSession::DosProtection::GetMaxPacketCounterAllowed(uint16 opcode) const { uint32 maxPacketCounterAllowed; diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index b1e5f45ad93..9e1324cfb0e 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -1607,7 +1607,6 @@ class TC_GAME_API WorldSession void HandleBfQueueInviteResponse(WorldPackets::Battlefield::BFMgrQueueInviteResponse& bfMgrQueueInviteResponse); void HandleBfQueueExitRequest(WorldPackets::Battlefield::BFMgrQueueExitRequest& bfMgrQueueExitRequest); - void HandleMinimapPingOpcode(WorldPackets::Party::MinimapPingClient& packet); void HandleRandomRollOpcode(WorldPackets::Misc::RandomRollClient& packet); void HandleFarSightOpcode(WorldPackets::Misc::FarSight& packet); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 6acaac3c567..0e3f05a024a 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1268,7 +1268,6 @@ void Spell::DoCreateItem(uint32 itemId, ItemContext context /*= ItemContext::NON /* == gem perfection handling over == */ - /* == profession specialization handling == */ // init items_count to 1, since 1 item will be created regardless of specialization @@ -1288,7 +1287,6 @@ void Spell::DoCreateItem(uint32 itemId, ItemContext context /*= ItemContext::NON /* == profession specialization handling over == */ - // can the player store the new item? ItemPosCountVec dest; uint32 no_space = 0; @@ -1329,7 +1327,6 @@ void Spell::DoCreateItem(uint32 itemId, ItemContext context /*= ItemContext::NON if (Guild* guild = player->GetGuild()) guild->AddGuildNews(GUILD_NEWS_ITEM_CRAFTED, player->GetGUID(), 0, pProto->GetId()); - // we succeeded in creating at least one item, so a levelup is possible player->UpdateCraftSkill(m_spellInfo->Id); } @@ -2964,7 +2961,6 @@ void Spell::EffectSummonObjectWild() o = target->GetOrientation(); } - Map* map = target->GetMap(); Position pos = Position(x, y, z, o); QuaternionData rot = QuaternionData::fromEulerAnglesZYX(o, 0.f, 0.f); diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index 812ecf23b0a..bf6f239536f 100644 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -119,7 +119,6 @@ enum SpellFamilyFlag SPELLFAMILYFLAG_SHAMAN_TOTEM_EFFECTS = 0x04000000 // Seems to be linked to most totems and some totem effects }; - #define SPELL_LINKED_MAX_SPELLS 200000 enum SpellLinkedType @@ -130,7 +129,6 @@ enum SpellLinkedType SPELL_LINK_REMOVE = 0 }; - // Spell proc event related declarations (accessed using SpellMgr functions) enum ProcFlags : uint32 { @@ -301,7 +299,6 @@ enum ProcAttributes : uint32 PROC_ATTR_REQ_SPELLMOD = 0x0000008, // requires triggering spell to be affected by proccing aura to drop charges PROC_ATTR_USE_STACKS_FOR_CHARGES = 0x0000010, // consuming proc drops a stack from proccing aura instead of charge - PROC_ATTR_REDUCE_PROC_60 = 0x0000080, // aura should have a reduced chance to proc if level of proc Actor > 60 PROC_ATTR_CANT_PROC_FROM_ITEM_CAST = 0x0000100, // do not allow aura proc if proc is caused by a spell casted by item }; diff --git a/src/server/game/Warden/WardenWin.cpp b/src/server/game/Warden/WardenWin.cpp index be6a9eec9d6..e9b24db152f 100644 --- a/src/server/game/Warden/WardenWin.cpp +++ b/src/server/game/Warden/WardenWin.cpp @@ -43,7 +43,6 @@ static constexpr char _luaEvalPostfix[] = ",'GUILD')end"; static_assert((sizeof(_luaEvalPrefix)-1 + sizeof(_luaEvalMidfix)-1 + sizeof(_luaEvalPostfix)-1 + WARDEN_MAX_LUA_CHECK_LENGTH) == 255); - WardenWin::WardenWin() : Warden(), _serverTicks(0) { for (WardenCheckCategory category : EnumUtils::Iterate<WardenCheckCategory>()) diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index c712675dd5e..d318257b6ad 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -578,7 +578,6 @@ void World::LoadConfigSettings(bool reload) sSupportMgr->SetSuggestionSystemStatus(m_bool_configs[CONFIG_SUPPORT_SUGGESTIONS_ENABLED]); } - ///- Get string for new logins (newly created characters) SetNewCharString(sConfigMgr->GetStringDefault("PlayerStart.String", "")); |
