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 | |
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)
107 files changed, 0 insertions, 144 deletions
diff --git a/cmake/macros/EnsureVersion.cmake b/cmake/macros/EnsureVersion.cmake index 5d9af294765..d30a38070cf 100644 --- a/cmake/macros/EnsureVersion.cmake +++ b/cmake/macros/EnsureVersion.cmake @@ -58,7 +58,6 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. - MACRO(NORMALIZE_VERSION _requested_version _normalized_version) STRING(REGEX MATCH "[^0-9]*[0-9]+\\.[0-9]+\\.[0-9]+.*" _threePartMatch "${_requested_version}") if(_threePartMatch) diff --git a/src/common/Collision/BoundingIntervalHierarchyWrapper.h b/src/common/Collision/BoundingIntervalHierarchyWrapper.h index 90c077d6764..f15e80b9a2e 100644 --- a/src/common/Collision/BoundingIntervalHierarchyWrapper.h +++ b/src/common/Collision/BoundingIntervalHierarchyWrapper.h @@ -23,7 +23,6 @@ #include <G3D/Array.h> #include <G3D/Set.h> - template<class T, class BoundsFunc = BoundsTrait<T> > class BIHWrap { diff --git a/src/common/Collision/DynamicTree.h b/src/common/Collision/DynamicTree.h index 6ddbb33c221..9b64c00d09b 100644 --- a/src/common/Collision/DynamicTree.h +++ b/src/common/Collision/DynamicTree.h @@ -15,7 +15,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ - #ifndef _DYNTREE_H #define _DYNTREE_H diff --git a/src/common/Collision/Management/MMapManager.h b/src/common/Collision/Management/MMapManager.h index c4abac2134a..d2862631fa6 100644 --- a/src/common/Collision/Management/MMapManager.h +++ b/src/common/Collision/Management/MMapManager.h @@ -51,7 +51,6 @@ namespace MMAP MMapTileSet loadedTileRefs; // maps [map grid coords] to [dtTile] }; - typedef std::unordered_map<uint32, MMapData*> MMapDataSet; // singleton class diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp index f9b7c4ac8b1..bce65486e62 100644 --- a/src/common/Debugging/WheatyExceptionReport.cpp +++ b/src/common/Debugging/WheatyExceptionReport.cpp @@ -1294,7 +1294,6 @@ bool logChildren) dataKind == DataIsStaticMember) continue; - symbolDetails.top().HasChildren = true; if (!logChildren) { diff --git a/src/common/Metric/Metric.h b/src/common/Metric/Metric.h index d8dcc53fd43..6871d5fa021 100644 --- a/src/common/Metric/Metric.h +++ b/src/common/Metric/Metric.h @@ -131,7 +131,6 @@ public: #define sMetric Metric::instance() - template<typename LoggerType> class MetricStopWatch { diff --git a/src/server/database/Database/Field.h b/src/server/database/Database/Field.h index a871ef64bfd..0229c852647 100644 --- a/src/server/database/Database/Field.h +++ b/src/server/database/Database/Field.h @@ -116,7 +116,6 @@ class TC_DATABASE_API Field return buf; } - bool IsNull() const { return data.value == nullptr; 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", "")); diff --git a/src/server/scripts/Battlefield/BattlefieldTB.cpp b/src/server/scripts/Battlefield/BattlefieldTB.cpp index b1f2c06238d..effbc045240 100644 --- a/src/server/scripts/Battlefield/BattlefieldTB.cpp +++ b/src/server/scripts/Battlefield/BattlefieldTB.cpp @@ -215,7 +215,6 @@ void BattlefieldTB::OnPlayerJoinWar(Player* player) player->CastSpell(player, SPELL_TOWER_ATTACK_BONUS, CastSpellExtraArgs(TRIGGERED_FULL_MASK).AddSpellMod(SPELLVALUE_AURA_STACK, GetData(BATTLEFIELD_TB_DATA_TOWERS_DESTROYED))); } - void BattlefieldTB::OnPlayerLeaveWar(Player* player) { RemoveAurasFromPlayer(player); diff --git a/src/server/scripts/Battlefield/BattlefieldWG.cpp b/src/server/scripts/Battlefield/BattlefieldWG.cpp index 7c6f33182db..ad88855f43a 100644 --- a/src/server/scripts/Battlefield/BattlefieldWG.cpp +++ b/src/server/scripts/Battlefield/BattlefieldWG.cpp @@ -481,7 +481,6 @@ bool BattlefieldWG::SetupBattlefield() m_GraveyardList[i] = graveyard; } - Workshops.resize(WG_MAX_WORKSHOP); // Spawn workshop creatures and gameobjects for (uint8 i = 0; i < WG_MAX_WORKSHOP; i++) @@ -577,7 +576,6 @@ void BattlefieldWG::OnBattleStart() else TC_LOG_ERROR("bg.battlefield", "WG: Failed to spawn titan relic."); - // Update tower visibility and update faction for (auto itr = CanonList.begin(); itr != CanonList.end(); ++itr) { @@ -1151,7 +1149,6 @@ uint32 BattlefieldWG::GetData(uint32 data) const return Battlefield::GetData(data); } - void BattlefieldWG::FillInitialWorldStates(WorldPackets::WorldState::InitWorldStates& packet) { packet.Worldstates.emplace_back(WS_BATTLEFIELD_WG_DEFENDED_A, GetData(BATTLEFIELD_WG_DATA_DEF_A)); diff --git a/src/server/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp index 2639f62e544..da14c9a1bcd 100644 --- a/src/server/scripts/Commands/cs_ban.cpp +++ b/src/server/scripts/Commands/cs_ban.cpp @@ -388,7 +388,6 @@ public: fields[0].GetCString(), fields[1].GetCString(), permanent ? handler->GetTrinityString(LANG_BANINFO_NEVER) : fields[2].GetCString(), permanent ? handler->GetTrinityString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[3].GetUInt64(), TimeFormat::ShortText).c_str(), fields[4].GetCString(), fields[5].GetCString()); - return true; } diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index 2dcb4a9138d..a2d64bfcd77 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -164,7 +164,6 @@ public: Player* player = handler->GetSession()->GetPlayer(); Seconds spawntm(spawntime.value_or(300)); - if (!sObjectMgr->GetGameObjectTemplate(objectId)) { handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, objectId); diff --git a/src/server/scripts/Commands/cs_pet.cpp b/src/server/scripts/Commands/cs_pet.cpp index f2582778cdc..d6f2a39e59e 100644 --- a/src/server/scripts/Commands/cs_pet.cpp +++ b/src/server/scripts/Commands/cs_pet.cpp @@ -99,8 +99,6 @@ public: // "kill" original creature creatureTarget->DespawnOrUnsummon(); - - // prepare visual effect for levelup pet->SetLevel(player->GetLevel() - 1); diff --git a/src/server/scripts/Commands/cs_ticket.cpp b/src/server/scripts/Commands/cs_ticket.cpp index f1b982b744b..471d46cd77f 100644 --- a/src/server/scripts/Commands/cs_ticket.cpp +++ b/src/server/scripts/Commands/cs_ticket.cpp @@ -164,8 +164,6 @@ bool ticket_commandscript::HandleTicketAssignToCommand(ChatHandler* handler, cha return true; } - - template<typename T> bool ticket_commandscript::HandleTicketCloseByIdCommand(ChatHandler* handler, char const* args) { @@ -285,7 +283,6 @@ bool ticket_commandscript::HandleTicketDeleteByIdCommand(ChatHandler* handler, c return true; } - template<typename T> bool ticket_commandscript::HandleTicketResetCommand(ChatHandler* handler, char const* /*args*/) { diff --git a/src/server/scripts/Custom/custom_script_loader.cpp b/src/server/scripts/Custom/custom_script_loader.cpp index 1df319bc501..9e5e9ba2bfd 100644 --- a/src/server/scripts/Custom/custom_script_loader.cpp +++ b/src/server/scripts/Custom/custom_script_loader.cpp @@ -17,7 +17,6 @@ // This is where scripts' loading functions should be declared: - // The name of this function should match: // void Add${NameOfDirectory}Scripts() void AddCustomScripts() diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index e7d1b1539f9..72883842491 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -47,7 +47,6 @@ enum Netherspite SPELL_NETHERSPITE_ROAR = 38684, }; - const float PortalCoord[3][3] = { {-11195.353516f, -1613.237183f, 278.237258f}, // Left side diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 0c430efc031..03699326393 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -124,7 +124,6 @@ public: void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) override { if (HellfireTimer) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 6942bd46368..f655288f977 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -1007,7 +1007,6 @@ enum JulianneRomulo ROMULO_Y = -1758, }; - enum RAJPhase { PHASE_JULIANNE = 0, diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index e9eac223c52..5fb0152518c 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -418,7 +418,6 @@ public: #define SAY_DIALOG_ARCANAGOS_8 "What have you done, wizard? This cannot be! I'm burning from... within!" #define SAY_DIALOG_MEDIVH_9 "He should not have angered me. I must go... recover my strength now..." - static float MedivPos[4] = {-11161.49f, -1902.24f, 91.48f, 1.94f}; static float ArcanagosPos[4] = {-11169.75f, -1881.48f, 95.39f, 4.83f}; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index bfbee8702f6..e29fffe06f9 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -245,8 +245,6 @@ Position const SummonPos[18] = { // Hall of Secrects - - // The Hall of the damned { 177.9624f, -68.23893f, 84.95197f, 3.228859f }, { 183.7705f, -61.43489f, 84.92424f, 5.148721f }, @@ -265,8 +263,6 @@ Position const SummonPos[18] = { 185.6157f, -42.91200f, 75.4812f, 4.45059f }, // Vault of the Ravenian - - }; enum Creatures diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp index af4f39f8140..080189461f8 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp @@ -462,7 +462,6 @@ class spell_apothecary_validate_area : public SpellScriptLoader targets.push_back(target); } - void HandleScript(SpellEffIndex /*effindex*/) { GetHitUnit()->CastSpell(GetHitUnit(), SPELL_BUNNY_LOCKDOWN, true); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 777523fb12b..c055c800ed3 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -221,7 +221,6 @@ class npc_voljin_zulaman : public CreatureScript } }; - void AddSC_zulaman() { new npc_voljin_zulaman(); 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 768292130ba..d96ed002392 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -202,7 +202,6 @@ class npc_hearthsinger_forresten_cot : public CreatureScript } } - private: InstanceScript const* const _instance; EventMap _events; @@ -1459,7 +1458,6 @@ public: } }; - void AddSC_culling_of_stratholme() { new npc_hearthsinger_forresten_cot(); diff --git a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp index c53ba579991..1075a2991db 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp @@ -85,7 +85,6 @@ enum Actions ACTION_EQUIP_DECIMATION_BLADE = 3, }; - enum Misc { EQUIP_DEFAULT = 1, diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp index 8f40fbccc91..04c94aa4480 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp @@ -82,7 +82,6 @@ enum Spells SPELL_CRUMBLING_RUIN = 75609, - SPELL_NEMESIS_STRIKE = 75604, SPELL_OMEGA_STANCE_SUMMON = 77106, diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 114479343d6..dd2e8bae1ed 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -190,7 +190,6 @@ public: summons.Summon(summoned); } - void KilledUnit(Unit* /*victim*/) override { Talk(SAY_KILL); diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index f843aaed16c..78f0fb9d653 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -225,7 +225,6 @@ public: DoFindNewTubber(); } - bool IsMovementActive; ObjectGuid TargetTubberGUID; }; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index 26c78f7286e..a077ec95b3c 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -82,7 +82,6 @@ public: _Reset(); } - void JustDied(Unit* /*killer*/) override { if (instance->GetData(DATA_BUG_TRIO_DEATH) < 2)// Unlootable if death diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp index 7b25f5bec46..c4cfc42e91e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -37,7 +37,6 @@ ObjectData const creatureData[] = { 0, 0 } // END }; - DoorData const doorData[] = { { AQ40_DOOR_1, DATA_SARTURA, DOOR_TYPE_PASSAGE }, diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index 6b5d3c4f364..b5961616295 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -49,8 +49,6 @@ enum RuulSnowhoof SAY_FINISH = 0 }; - - Position const RuulSnowhoofSummonsCoord[6] = { { 3449.218018f, -587.825073f, 174.978867f, 4.714445f }, diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp index 37bd09ccc62..7c2d2479dba 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -126,7 +126,6 @@ struct boss_volazj : public BossAI if (me->HasUnitFlag(UNIT_FLAG_NOT_SELECTABLE)) damage = 0; - if ((GetHealthPct(0) >= 66 && GetHealthPct(damage) < 66)|| (GetHealthPct(0) >= 33 && GetHealthPct(damage) < 33)) { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index d4dde67813b..7e3a6734b84 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1908,8 +1908,6 @@ class spell_halion_blazing_aura : public SpellScriptLoader } }; - - void AddSC_boss_halion() { new boss_halion(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 21eb7f34ceb..755f8601732 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -107,7 +107,6 @@ enum Misc POINT_SUMMONED = 1 }; - struct boss_jaraxxus : public BossAI { boss_jaraxxus(Creature* creature) : BossAI(creature, DATA_JARAXXUS) { } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 6d4f1ecadb8..ff2ed619193 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -274,7 +274,6 @@ class npc_pit_of_saron_icicle : public CreatureScript } }; - class spell_pos_ice_shards : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 230d3146a4d..817dff2326f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -124,7 +124,6 @@ enum Actions ACTION_ACQUIRE_TARGET }; - /* Room side checking logic */ static AreaBoundary* const livingSide = new RectangleBoundary(2633.84f, 2750.49f, -3434.0f, -3360.78f); static AreaBoundary* const deadSide = new RectangleBoundary(2633.84f, 2750.49f, -3360.78f, -3285.0f); @@ -161,7 +160,6 @@ static Player* FindEligibleTarget(Creature const* me, bool isGateOpen) return nullptr; } - /* Wave data */ typedef std::pair<uint32, uint8> GothikWaveEntry; // (npcEntry, npcCount) typedef std::set<GothikWaveEntry> GothikWave; @@ -286,7 +284,6 @@ const GothikWaveData waves25 = 0} }; - // GUID of first trigger NPC (used as offset for guid checks) // 0-1 are living side soul triggers, 2-3 are spectral side soul triggers, 4 is living rider spawn trigger, 5-7 are living other spawn trigger, 8-12 are skull pile triggers const uint32 CGUID_TRIGGER = 127618; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 0baebfb12da..77a328c58fe 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -122,7 +122,6 @@ enum PetMisc OVERLOAD_DISTANCE = 28 }; - //Thaddius enum ThaddiusYells { @@ -1242,7 +1241,6 @@ class achievement_thaddius_shocking : public AchievementCriteriaScript } }; - void AddSC_boss_thaddius() { RegisterNaxxramasCreatureAI(boss_thaddius); diff --git a/src/server/scripts/Northrend/Naxxramas/naxxramas.h b/src/server/scripts/Northrend/Naxxramas/naxxramas.h index 918fe62e218..dfcae04fc8d 100644 --- a/src/server/scripts/Northrend/Naxxramas/naxxramas.h +++ b/src/server/scripts/Northrend/Naxxramas/naxxramas.h @@ -212,7 +212,6 @@ enum NAXInstanceTexts SAY_DIALOGUE_SAPPHIRON_LICH_KING2 = 2 }; - template <class AI, class T> inline AI* GetNaxxramasAI(T* obj) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index e722a9b8546..1530ade9282 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -502,7 +502,6 @@ struct npc_pummeller : public ScriptedAI return; } - if (Creature* xt002 = _instance->GetCreature(BOSS_XT002)) xt002->AI()->JustSummoned(me); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp index 47e95d0fc7c..3fed30c572b 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp @@ -72,7 +72,6 @@ class instance_utgarde_pinnacle : public InstanceMapScript LoadObjectData(creatureData, gameObjectData); } - void OnGameObjectCreate(GameObject* go) override { InstanceScript::OnGameObjectCreate(go); diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 1f19e810e34..34f35cdd96d 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -136,7 +136,6 @@ public: void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } - void JustDied(Unit* killer) override { if (!killer || killer->GetTypeId() != TYPEID_PLAYER) @@ -265,7 +264,6 @@ public: void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } - void JustDied(Unit* /*killer*/) override { if (GameObject* go_caribou = ObjectAccessor::GetGameObject(*me, go_caribouGUID)) diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index 3f448058ed9..218d8d16d2d 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -240,7 +240,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 /*diff*/) override { if (!UpdateVictim()) diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index 127895e2d91..5a1f9febe1c 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -445,7 +445,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void JustSummoned(Creature* Summoned) override { Summons.Summon(Summoned); diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index ca4bca84ac4..6b1022c631f 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -164,7 +164,6 @@ public: } }; - /*#### ## npc_released_offspring_harkoa ####*/ diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index 5c60a49e569..959371da929 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -36,7 +36,6 @@ uint32 const ZM_GRAVEYARD_ZONE = 3521; // linked when the central tower is controlled uint32 const ZM_GRAVEYARD_ID = 969; - // banners 182527, 182528, 182529, gotta check them ingame go_type const ZM_Banner_A = { 182527, 530, { 253.54f, 7083.81f, 36.7728f, -0.017453f }, { 0.0f, 0.0f, 0.008727f, -0.999962f } }; go_type const ZM_Banner_H = { 182528, 530, { 253.54f, 7083.81f, 36.7728f, -0.017453f }, { 0.0f, 0.0f, 0.008727f, -0.999962f } }; diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp index 5515ebd1f11..52b66895bfe 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp @@ -89,7 +89,6 @@ enum Events EVENT_CHARGE_PLAYER }; - struct boss_gurtogg_bloodboil : public BossAI { boss_gurtogg_bloodboil(Creature* creature) : BossAI(creature, DATA_GURTOGG_BLOODBOIL) diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index bd0d3b03117..7b9215be52a 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -2127,7 +2127,6 @@ class spell_illidan_demon_transform1 : public AuraScript } }; - // 40398 - Demon Transform 2 class spell_illidan_demon_transform2 : public AuraScript { diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp index 7841490fcfd..f29b0fae409 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp @@ -238,7 +238,6 @@ private: bool _inCombat; }; - struct IllidariCouncilBossAI : public BossAI { IllidariCouncilBossAI(Creature* creature, uint32 bossId) : BossAI(creature, bossId), _bossId(bossId) diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 3ce7e4b3cf8..830acc59b64 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -15,7 +15,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ - #include "ScriptMgr.h" #include "black_temple.h" #include "ScriptedCreature.h" diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index ce61ac204d3..5a173298087 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -198,7 +198,6 @@ static float const MIDDLE_OF_ROOM = 400.0f; static float const FACE_THE_DOOR = 0.08726646f; static float const FACE_THE_PLATFORM = 3.118662f; - struct boss_shade_of_akama : public BossAI { boss_shade_of_akama(Creature* creature) : BossAI(creature, DATA_SHADE_OF_AKAMA) @@ -795,7 +794,6 @@ struct npc_ashtongue_defender : public ScriptedAI _events.ScheduleEvent(EVENT_WINDFURY, 8s, 12s); } - void UpdateAI(uint32 diff) override { if (!UpdateVictim()) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index c29c6117a19..0b602db9e77 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -68,7 +68,6 @@ enum HydrossTheUnstable ENTRY_BEAM_DUMMY = 21934 }; - #define HYDROSS_X -239.439f #define HYDROSS_Y -363.481f diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index d76063f2b74..008a55db423 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -603,7 +603,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) override { if (!VashjGUID) @@ -853,7 +852,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) override { if (CheckTimer <= diff) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 92e00e915c2..ef0fd215239 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -45,7 +45,6 @@ enum Spells SPELL_SUBMERGE = 37550, SPELL_EMERGE = 20568, - // Ambusher spells SPELL_SPREAD_SHOT = 37790, SPELL_SHOOT = 37770, diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 7f12263d4fb..ab2586716e2 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -49,7 +49,6 @@ enum Misc MIN_KILLS = 30 }; - //NOTE: there are 6 platforms //there should be 3 shatterers and 2 priestess on all platforms, total of 30 elites, else it won't work! //delete all other elites not on platforms! these mobs should only be on those platforms nowhere else. diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp index 175f7571b18..7846ec41524 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp @@ -148,7 +148,6 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void AttackStart(Unit* /*who*/) override { } void JustEngagedWith(Unit* /*who*/) override { } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp index 514300e96af..860f02d6a49 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -279,7 +279,6 @@ class instance_shattered_halls : public InstanceMapScript }; }; - void AddSC_instance_shattered_halls() { new instance_shattered_halls(); diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 93b5369e1a8..114bded690d 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -648,7 +648,6 @@ class npc_simon_bunny : public CreatureScript playableSequence.push_back(*i); } - // Remove any existant glowing auras over clusters and set clusters ready for interating with them. void PrepareClusters(bool clustersOnly = false) { diff --git a/src/server/scripts/Pet/pet_shaman.cpp b/src/server/scripts/Pet/pet_shaman.cpp index e997691da51..9ee11397991 100644 --- a/src/server/scripts/Pet/pet_shaman.cpp +++ b/src/server/scripts/Pet/pet_shaman.cpp @@ -50,7 +50,6 @@ class npc_pet_shaman_earth_elemental : public CreatureScript { npc_pet_shaman_earth_elementalAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() override { _events.Reset(); diff --git a/src/server/scripts/Spells/spell_dh.cpp b/src/server/scripts/Spells/spell_dh.cpp index faacf4ab4bc..15f33bf9be8 100644 --- a/src/server/scripts/Spells/spell_dh.cpp +++ b/src/server/scripts/Spells/spell_dh.cpp @@ -196,7 +196,6 @@ class spell_dh_chaos_strike : public AuraScript } }; - // 206416 - First Blood class spell_dh_first_blood : public AuraScript { @@ -458,14 +457,12 @@ void AddSC_demon_hunter_spell_scripts() /* Spells & Auras */ - /* Auras */ RegisterSpellScript(spell_dh_first_blood); /* AreaTrigger */ - /* Spells */ RegisterSpellScript(spell_dh_blade_dance); diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 4661db4d0db..72577473715 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -430,7 +430,6 @@ class spell_dk_death_grip_initial : public SpellScript } }; - // 48743 - Death Pact class spell_dk_death_pact : public AuraScript { diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 60cd50b0abd..e5bb0de2b37 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -2809,7 +2809,6 @@ enum ReindeerTransformation SPELL_REINDEER_60 = 25858, }; - class spell_item_reindeer_transformation : public SpellScript { PrepareSpellScript(spell_item_reindeer_transformation); diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 37492620dee..c613a510b34 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -2138,7 +2138,6 @@ class spell_q13264_q13276_q13288_q13289_bloated_abom_feign_death : public AuraSc } }; - class spell_q13264_q13276_q13288_q13289_area_restrict_abom : public SpellScript { PrepareSpellScript(spell_q13264_q13276_q13288_q13289_area_restrict_abom); diff --git a/src/server/scripts/World/action_ip_logger.cpp b/src/server/scripts/World/action_ip_logger.cpp index f8b45b51b73..47691a565fd 100644 --- a/src/server/scripts/World/action_ip_logger.cpp +++ b/src/server/scripts/World/action_ip_logger.cpp @@ -311,7 +311,6 @@ public: } }; - void AddSC_action_ip_logger() { new AccountActionIpLogger(); diff --git a/src/tools/mmaps_generator/IntermediateValues.cpp b/src/tools/mmaps_generator/IntermediateValues.cpp index 0240ee66017..10e2bff30f0 100644 --- a/src/tools/mmaps_generator/IntermediateValues.cpp +++ b/src/tools/mmaps_generator/IntermediateValues.cpp @@ -233,7 +233,6 @@ namespace MMAP fclose(objFile); - char tileString[25]; sprintf(tileString, "[%02u,%02u]: ", tileY, tileX); printf("%sWriting debug output... \r", tileString); diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index ffae6eb2b29..2310bd78b67 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -380,7 +380,6 @@ namespace MMAP useLiquid = false; } - // if there is no terrain, don't use terrain if (!ttriangles.size()) useTerrain = false; diff --git a/src/tools/vmap4_assembler/TileAssembler.cpp b/src/tools/vmap4_assembler/TileAssembler.cpp index b439dbf25ce..7594a46e655 100644 --- a/src/tools/vmap4_assembler/TileAssembler.cpp +++ b/src/tools/vmap4_assembler/TileAssembler.cpp @@ -396,7 +396,6 @@ namespace VMAP READ_OR_RETURN(&mogpflags, sizeof(uint32)); READ_OR_RETURN(&GroupWMOID, sizeof(uint32)); - Vector3 vec1, vec2; READ_OR_RETURN(&vec1, sizeof(Vector3)); |