diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-02-13 15:07:00 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-02-13 15:07:00 +0100 |
| commit | 439b027d48a32848e162927f50df1564b985c866 (patch) | |
| tree | 2206ea55e472a5f3de4a9a4d15de00a6a8873f6b | |
| parent | 904299413ed711042135386583982e2911d21551 (diff) | |
Core/Misc: Cleanup unused includes
182 files changed, 38 insertions, 237 deletions
diff --git a/src/common/Collision/BoundingIntervalHierarchy.h b/src/common/Collision/BoundingIntervalHierarchy.h index e15162dcd61..b5ce289f905 100644 --- a/src/common/Collision/BoundingIntervalHierarchy.h +++ b/src/common/Collision/BoundingIntervalHierarchy.h @@ -28,7 +28,6 @@ #include <vector> #include <algorithm> #include <limits> -#include <cmath> #include "string.h" #define MAX_STACK_SIZE 64 diff --git a/src/common/Collision/DynamicTree.cpp b/src/common/Collision/DynamicTree.cpp index 2aa47912528..8d46455b16b 100644 --- a/src/common/Collision/DynamicTree.cpp +++ b/src/common/Collision/DynamicTree.cpp @@ -18,10 +18,8 @@ #include "DynamicTree.h" #include "BoundingIntervalHierarchyWrapper.h" #include "GameObjectModel.h" -#include "Log.h" #include "MapTree.h" #include "ModelIgnoreFlags.h" -#include "ModelInstance.h" #include "RegularGrid.h" #include "Timer.h" #include "VMapFactory.h" diff --git a/src/common/Collision/Management/MMapFactory.cpp b/src/common/Collision/Management/MMapFactory.cpp index f3826d3b3b8..c50bc69cb91 100644 --- a/src/common/Collision/Management/MMapFactory.cpp +++ b/src/common/Collision/Management/MMapFactory.cpp @@ -16,7 +16,6 @@ */ #include "MMapFactory.h" -#include "Config.h" namespace MMAP { diff --git a/src/common/Collision/Management/MMapFactory.h b/src/common/Collision/Management/MMapFactory.h index 27745450d50..d586eadbbcb 100644 --- a/src/common/Collision/Management/MMapFactory.h +++ b/src/common/Collision/Management/MMapFactory.h @@ -20,10 +20,6 @@ #include "Define.h" #include "MMapManager.h" -#include "DetourAlloc.h" -#include "DetourNavMesh.h" -#include "DetourNavMeshQuery.h" -#include <unordered_map> namespace MMAP { diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp index d60453ef97f..3ab64e99251 100644 --- a/src/common/Collision/Management/VMapManager2.cpp +++ b/src/common/Collision/Management/VMapManager2.cpp @@ -15,18 +15,17 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <iostream> -#include <iomanip> -#include <string> -#include <sstream> #include "VMapManager2.h" +#include "Errors.h" +#include "Log.h" #include "MapTree.h" #include "ModelInstance.h" +#include "VMapDefinitions.h" #include "WorldModel.h" #include <G3D/Vector3.h> -#include "Log.h" -#include "VMapDefinitions.h" -#include "Errors.h" +#include <iomanip> +#include <sstream> +#include <string> using G3D::Vector3; diff --git a/src/common/Collision/Models/WorldModel.h b/src/common/Collision/Models/WorldModel.h index 8e2c97501e1..16d44ac89ab 100644 --- a/src/common/Collision/Models/WorldModel.h +++ b/src/common/Collision/Models/WorldModel.h @@ -18,7 +18,6 @@ #ifndef _WORLDMODEL_H #define _WORLDMODEL_H -#include <G3D/HashTrait.h> #include <G3D/Vector3.h> #include <G3D/AABox.h> #include <G3D/Ray.h> diff --git a/src/common/Collision/VMapDefinitions.h b/src/common/Collision/VMapDefinitions.h index 469b86408ae..f72b1cace31 100644 --- a/src/common/Collision/VMapDefinitions.h +++ b/src/common/Collision/VMapDefinitions.h @@ -17,7 +17,7 @@ #ifndef _VMAPDEFINITIONS_H #define _VMAPDEFINITIONS_H -#include <cstring> + #include <cstdio> #define LIQUID_TILE_SIZE (533.333f / 128.f) diff --git a/src/common/Configuration/Config.cpp b/src/common/Configuration/Config.cpp index 12d5e6a1118..be9ad42031c 100644 --- a/src/common/Configuration/Config.cpp +++ b/src/common/Configuration/Config.cpp @@ -18,7 +18,6 @@ #include "Config.h" #include "Log.h" #include "StringConvert.h" -#include "Util.h" #include <boost/property_tree/ini_parser.hpp> #include <algorithm> #include <memory> diff --git a/src/common/Cryptography/Authentication/SRP6.h b/src/common/Cryptography/Authentication/SRP6.h index 0f5a79803d6..8b1a0aafd59 100644 --- a/src/common/Cryptography/Authentication/SRP6.h +++ b/src/common/Cryptography/Authentication/SRP6.h @@ -21,7 +21,6 @@ #include "AuthDefines.h" #include "BigNumber.h" #include "Define.h" -#include "Common.h" #include "CryptoHash.h" #include "Optional.h" #include <array> diff --git a/src/common/Cryptography/Authentication/WorldPacketCrypt.h b/src/common/Cryptography/Authentication/WorldPacketCrypt.h index 600d0d1715e..1936ff5ca5f 100644 --- a/src/common/Cryptography/Authentication/WorldPacketCrypt.h +++ b/src/common/Cryptography/Authentication/WorldPacketCrypt.h @@ -19,7 +19,6 @@ #define _WORLDPACKETCRYPT_H #include "AES.h" -#include <array> class TC_COMMON_API WorldPacketCrypt { diff --git a/src/common/Cryptography/BigNumber.cpp b/src/common/Cryptography/BigNumber.cpp index 62e459c6dce..65f4bb5808a 100644 --- a/src/common/Cryptography/BigNumber.cpp +++ b/src/common/Cryptography/BigNumber.cpp @@ -18,7 +18,6 @@ #include "Cryptography/BigNumber.h" #include "Errors.h" #include <openssl/bn.h> -#include <cstring> #include <algorithm> #include <memory> diff --git a/src/common/Cryptography/SessionKeyGenerator.h b/src/common/Cryptography/SessionKeyGenerator.h index 1ff20d6312e..9fbb5ad00d0 100644 --- a/src/common/Cryptography/SessionKeyGenerator.h +++ b/src/common/Cryptography/SessionKeyGenerator.h @@ -19,7 +19,6 @@ #define TRINITY_SESSIONKEYGENERATOR_HPP #include "CryptoHash.h" -#include <cstring> template <typename Hash> class SessionKeyGenerator diff --git a/src/common/Cryptography/TOTP.cpp b/src/common/Cryptography/TOTP.cpp index 9e89c212af4..86050f9ae13 100644 --- a/src/common/Cryptography/TOTP.cpp +++ b/src/common/Cryptography/TOTP.cpp @@ -16,7 +16,6 @@ */ #include "TOTP.h" -#include <cstring> #include <openssl/evp.h> #include <openssl/hmac.h> diff --git a/src/common/DataStores/DB2FileLoader.h b/src/common/DataStores/DB2FileLoader.h index 72a5f66768d..35bd6a5d644 100644 --- a/src/common/DataStores/DB2FileLoader.h +++ b/src/common/DataStores/DB2FileLoader.h @@ -21,7 +21,6 @@ #include "Common.h" #include <exception> #include <string> -#include <vector> class DB2FileLoaderImpl; struct DB2FieldMeta; diff --git a/src/common/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp index af3f5052db8..f0754971afa 100644 --- a/src/common/Debugging/WheatyExceptionReport.cpp +++ b/src/common/Debugging/WheatyExceptionReport.cpp @@ -4,7 +4,6 @@ // FILE: WheatyExceptionReport.CPP //========================================== #include "WheatyExceptionReport.h" -#include "Common.h" #include "Errors.h" #include "GitRevision.h" #include <algorithm> diff --git a/src/common/IPLocation/IPLocation.cpp b/src/common/IPLocation/IPLocation.cpp index 2f9ed6b0dec..5d6343da95b 100644 --- a/src/common/IPLocation/IPLocation.cpp +++ b/src/common/IPLocation/IPLocation.cpp @@ -22,7 +22,6 @@ #include "IpAddress.h" #include "Log.h" #include <fstream> -#include <iostream> IpLocationStore::IpLocationStore() { diff --git a/src/common/Logging/AppenderConsole.cpp b/src/common/Logging/AppenderConsole.cpp index af2117c6d0c..61efed60e90 100644 --- a/src/common/Logging/AppenderConsole.cpp +++ b/src/common/Logging/AppenderConsole.cpp @@ -21,7 +21,6 @@ #include "StringFormat.h" #include "StringConvert.h" #include "Util.h" -#include <sstream> #if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS #include <Windows.h> diff --git a/src/common/Logging/AppenderFile.cpp b/src/common/Logging/AppenderFile.cpp index bb38cade4e4..f249f652a47 100644 --- a/src/common/Logging/AppenderFile.cpp +++ b/src/common/Logging/AppenderFile.cpp @@ -19,7 +19,6 @@ #include "Log.h" #include "LogMessage.h" #include "StringConvert.h" -#include "Util.h" #include <algorithm> AppenderFile::AppenderFile(uint8 id, std::string const& name, LogLevel level, AppenderFlags flags, std::vector<std::string_view> const& args) : diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp index fba5ac84aaf..9f44654f38d 100644 --- a/src/common/Logging/Log.cpp +++ b/src/common/Logging/Log.cpp @@ -18,7 +18,6 @@ #include "Log.h" #include "AppenderConsole.h" #include "AppenderFile.h" -#include "Common.h" #include "Config.h" #include "Errors.h" #include "Logger.h" diff --git a/src/common/Metric/Metric.cpp b/src/common/Metric/Metric.cpp index 97d68568a3f..56e7b8cdf17 100644 --- a/src/common/Metric/Metric.cpp +++ b/src/common/Metric/Metric.cpp @@ -16,7 +16,6 @@ */ #include "Metric.h" -#include "Common.h" #include "Config.h" #include "DeadlineTimer.h" #include "Log.h" diff --git a/src/common/Platform/ServiceWin32.cpp b/src/common/Platform/ServiceWin32.cpp index 7e99b61ac64..54ebbf5ec33 100644 --- a/src/common/Platform/ServiceWin32.cpp +++ b/src/common/Platform/ServiceWin32.cpp @@ -17,7 +17,6 @@ #ifdef _WIN32 -#include "Common.h" #include "Log.h" #include <cstring> #include <windows.h> diff --git a/src/common/Threading/MPSCQueue.h b/src/common/Threading/MPSCQueue.h index 5f71b9dac42..91654546298 100644 --- a/src/common/Threading/MPSCQueue.h +++ b/src/common/Threading/MPSCQueue.h @@ -19,7 +19,7 @@ #define MPSCQueue_h__ #include <atomic> -#include <utility> +#include <type_traits> namespace Trinity { diff --git a/src/common/Utilities/AsyncCallbackProcessor.h b/src/common/Utilities/AsyncCallbackProcessor.h index 76781f49425..8a0b123b1b7 100644 --- a/src/common/Utilities/AsyncCallbackProcessor.h +++ b/src/common/Utilities/AsyncCallbackProcessor.h @@ -18,7 +18,6 @@ #ifndef AsyncCallbackProcessor_h__ #define AsyncCallbackProcessor_h__ -#include "Define.h" #include <algorithm> #include <vector> diff --git a/src/common/Utilities/IteratorPair.h b/src/common/Utilities/IteratorPair.h index ba3077963cf..5d24c931ef2 100644 --- a/src/common/Utilities/IteratorPair.h +++ b/src/common/Utilities/IteratorPair.h @@ -18,7 +18,6 @@ #ifndef IteratorPair_h__ #define IteratorPair_h__ -#include "Define.h" #include <utility> namespace Trinity diff --git a/src/server/bnetserver/REST/LoginRESTService.cpp b/src/server/bnetserver/REST/LoginRESTService.cpp index 4463438f6e2..2413ee7d90b 100644 --- a/src/server/bnetserver/REST/LoginRESTService.cpp +++ b/src/server/bnetserver/REST/LoginRESTService.cpp @@ -23,9 +23,7 @@ #include "Errors.h" #include "IpNetwork.h" #include "ProtobufJSON.h" -#include "Realm.h" #include "Resolver.h" -#include "SessionManager.h" #include "SslContext.h" #include "Util.h" #include "httpget.h" diff --git a/src/server/bnetserver/REST/LoginRESTService.h b/src/server/bnetserver/REST/LoginRESTService.h index 9309f71f68f..f36bfaa806f 100644 --- a/src/server/bnetserver/REST/LoginRESTService.h +++ b/src/server/bnetserver/REST/LoginRESTService.h @@ -20,7 +20,6 @@ #include "Define.h" #include "IoContext.h" -#include "IpAddress.h" #include "Login.pb.h" #include "Session.h" #include <boost/asio/ip/tcp.hpp> diff --git a/src/server/bnetserver/Server/Session.h b/src/server/bnetserver/Server/Session.h index 520ee263545..75fe2f19f02 100644 --- a/src/server/bnetserver/Server/Session.h +++ b/src/server/bnetserver/Server/Session.h @@ -25,7 +25,6 @@ #include "Socket.h" #include "QueryResult.h" #include <boost/asio/ip/tcp.hpp> -#include <boost/asio/ssl.hpp> #include <google/protobuf/message.h> #include <memory> diff --git a/src/server/bnetserver/Services/AccountService.h b/src/server/bnetserver/Services/AccountService.h index 884c0bd5b16..19e6fb5b2e4 100644 --- a/src/server/bnetserver/Services/AccountService.h +++ b/src/server/bnetserver/Services/AccountService.h @@ -18,7 +18,6 @@ #ifndef AccountService_h__ #define AccountService_h__ -#include "Common.h" #include "Service.h" #include "account_service.pb.h" diff --git a/src/server/bnetserver/Services/AuthenticationService.h b/src/server/bnetserver/Services/AuthenticationService.h index 03f39e2dc7b..891ae8957ee 100644 --- a/src/server/bnetserver/Services/AuthenticationService.h +++ b/src/server/bnetserver/Services/AuthenticationService.h @@ -18,7 +18,6 @@ #ifndef AuthenticationService_h__ #define AuthenticationService_h__ -#include "Common.h" #include "Service.h" #include "authentication_service.pb.h" diff --git a/src/server/bnetserver/Services/ConnectionService.cpp b/src/server/bnetserver/Services/ConnectionService.cpp index 64f0dd5be3d..ab8d6b838ed 100644 --- a/src/server/bnetserver/Services/ConnectionService.cpp +++ b/src/server/bnetserver/Services/ConnectionService.cpp @@ -17,7 +17,6 @@ #include "ConnectionService.h" #include "Duration.h" -#include "Log.h" #include "Session.h" #include "Util.h" #include "BattlenetRpcErrorCodes.h" diff --git a/src/server/bnetserver/Services/ConnectionService.h b/src/server/bnetserver/Services/ConnectionService.h index c7049b2eaad..028c1ec4205 100644 --- a/src/server/bnetserver/Services/ConnectionService.h +++ b/src/server/bnetserver/Services/ConnectionService.h @@ -18,7 +18,6 @@ #ifndef ConnectionService_h__ #define ConnectionService_h__ -#include "Common.h" #include "Service.h" #include "connection_service.pb.h" diff --git a/src/server/bnetserver/Services/GameUtilitiesService.h b/src/server/bnetserver/Services/GameUtilitiesService.h index 711d9128fb4..ccd69dcd53d 100644 --- a/src/server/bnetserver/Services/GameUtilitiesService.h +++ b/src/server/bnetserver/Services/GameUtilitiesService.h @@ -18,7 +18,6 @@ #ifndef GameUtilitiesServiceService_h__ #define GameUtilitiesServiceService_h__ -#include "Common.h" #include "Service.h" #include "game_utilities_service.pb.h" diff --git a/src/server/bnetserver/Services/ServiceDispatcher.h b/src/server/bnetserver/Services/ServiceDispatcher.h index 3c0c426fa73..1fdaf1f8749 100644 --- a/src/server/bnetserver/Services/ServiceDispatcher.h +++ b/src/server/bnetserver/Services/ServiceDispatcher.h @@ -19,8 +19,6 @@ #define ServiceDispatcher_h__ #include "MessageBuffer.h" -#include "Log.h" -#include "Common.h" #include "AccountService.h" #include "AuthenticationService.h" #include "challenge_service.pb.h" diff --git a/src/server/database/Database/AdhocStatement.cpp b/src/server/database/Database/AdhocStatement.cpp index 43be78c76c4..39a753f0212 100644 --- a/src/server/database/Database/AdhocStatement.cpp +++ b/src/server/database/Database/AdhocStatement.cpp @@ -16,7 +16,6 @@ */ #include "AdhocStatement.h" -#include "Errors.h" #include "MySQLConnection.h" #include "QueryResult.h" #include <cstdlib> diff --git a/src/server/database/Database/Field.cpp b/src/server/database/Database/Field.cpp index 802bd0291d8..9a5c3a782f1 100644 --- a/src/server/database/Database/Field.cpp +++ b/src/server/database/Database/Field.cpp @@ -18,7 +18,6 @@ #include "Field.h" #include "Errors.h" #include "Log.h" -#include "MySQLHacks.h" #include <cstring> Field::Field() diff --git a/src/server/database/Database/MySQLConnection.h b/src/server/database/Database/MySQLConnection.h index ea41ce3e0aa..2dad920cdd5 100644 --- a/src/server/database/Database/MySQLConnection.h +++ b/src/server/database/Database/MySQLConnection.h @@ -20,7 +20,6 @@ #include "Define.h" #include "DatabaseEnvFwd.h" -#include <map> #include <memory> #include <mutex> #include <string> diff --git a/src/server/database/Database/PreparedStatement.cpp b/src/server/database/Database/PreparedStatement.cpp index 8c57654b5b2..acb86b2c860 100644 --- a/src/server/database/Database/PreparedStatement.cpp +++ b/src/server/database/Database/PreparedStatement.cpp @@ -18,10 +18,8 @@ #include "PreparedStatement.h" #include "Errors.h" #include "MySQLConnection.h" -#include "MySQLPreparedStatement.h" #include "QueryResult.h" -#include "Log.h" -#include "MySQLWorkaround.h" +#include "StringFormat.h" PreparedStatementBase::PreparedStatementBase(uint32 index, uint8 capacity) : m_index(index), statement_data(capacity) { } diff --git a/src/server/database/Database/QueryCallback.h b/src/server/database/Database/QueryCallback.h index 6cc315964b7..76c52447750 100644 --- a/src/server/database/Database/QueryCallback.h +++ b/src/server/database/Database/QueryCallback.h @@ -18,13 +18,11 @@ #ifndef _QUERY_CALLBACK_H #define _QUERY_CALLBACK_H -#include "Define.h" #include "DatabaseEnvFwd.h" +#include "Define.h" #include <functional> -#include <future> #include <list> #include <queue> -#include <utility> class TC_DATABASE_API QueryCallback { diff --git a/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.h index e946cce1ec4..7252b1effe1 100644 --- a/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.h @@ -21,6 +21,7 @@ #include "MovementGenerator.h" #include "PathMovementBase.h" #include <deque> +#include <vector> class Player; struct TaxiPathNodeEntry; diff --git a/src/server/scripts/Argus/AntorusTheBurningThrone/instance_antorus_the_burning_throne.cpp b/src/server/scripts/Argus/AntorusTheBurningThrone/instance_antorus_the_burning_throne.cpp index 5f13e2b0877..1ea867c7317 100644 --- a/src/server/scripts/Argus/AntorusTheBurningThrone/instance_antorus_the_burning_throne.cpp +++ b/src/server/scripts/Argus/AntorusTheBurningThrone/instance_antorus_the_burning_throne.cpp @@ -19,7 +19,6 @@ #include "antorus_the_burning_throne.h" #include "Creature.h" #include "CreatureAI.h" -#include "GameObject.h" #include "InstanceScript.h" #include "Map.h" diff --git a/src/server/scripts/Battlefield/BattlefieldTB.cpp b/src/server/scripts/Battlefield/BattlefieldTB.cpp index 5295f1f51ea..b1f2c06238d 100644 --- a/src/server/scripts/Battlefield/BattlefieldTB.cpp +++ b/src/server/scripts/Battlefield/BattlefieldTB.cpp @@ -34,7 +34,6 @@ #include "Player.h" #include "Random.h" #include "ScriptMgr.h" -#include "SpellAuras.h" #include "TemporarySummon.h" #include "World.h" #include "WorldStatePackets.h" diff --git a/src/server/scripts/Commands/cs_arena.cpp b/src/server/scripts/Commands/cs_arena.cpp index 7a80eca4868..fabc9afdb7c 100644 --- a/src/server/scripts/Commands/cs_arena.cpp +++ b/src/server/scripts/Commands/cs_arena.cpp @@ -28,8 +28,6 @@ EndScriptData */ #include "Chat.h" #include "ChatCommand.h" #include "Language.h" -#include "Log.h" -#include "ObjectMgr.h" #include "RBAC.h" #include "WorldSession.h" diff --git a/src/server/scripts/Commands/cs_event.cpp b/src/server/scripts/Commands/cs_event.cpp index 7e1473e53a9..ae11663e267 100644 --- a/src/server/scripts/Commands/cs_event.cpp +++ b/src/server/scripts/Commands/cs_event.cpp @@ -28,7 +28,6 @@ EndScriptData */ #include "GameEventMgr.h" #include "GameTime.h" #include "Language.h" -#include "Player.h" #include "RBAC.h" using namespace Trinity::ChatCommands; diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index f8b1497e9e8..7bbd5196a7c 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -29,7 +29,6 @@ EndScriptData */ #include "DatabaseEnv.h" #include "Language.h" #include "ObjectAccessor.h" -#include "Opcodes.h" #include "Player.h" #include "Realm.h" #include "World.h" diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index e5caaadecb0..ef923230077 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -26,7 +26,6 @@ EndScriptData */ #include "Chat.h" #include "ChatCommand.h" #include "Containers.h" -#include "DatabaseEnv.h" #include "DB2Stores.h" #include "Language.h" #include "MapManager.h" diff --git a/src/server/scripts/Commands/cs_group.cpp b/src/server/scripts/Commands/cs_group.cpp index b18233d5a6e..41db433f631 100644 --- a/src/server/scripts/Commands/cs_group.cpp +++ b/src/server/scripts/Commands/cs_group.cpp @@ -26,7 +26,6 @@ #include "LFG.h" #include "Map.h" #include "ObjectAccessor.h" -#include "ObjectMgr.h" #include "PhasingHandler.h" #include "Player.h" #include "RBAC.h" diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp index 18bec6401c2..7d5a5cd8552 100644 --- a/src/server/scripts/Commands/cs_learn.cpp +++ b/src/server/scripts/Commands/cs_learn.cpp @@ -28,7 +28,6 @@ EndScriptData */ #include "DB2Stores.h" #include "Language.h" #include "LanguageMgr.h" -#include "ObjectMgr.h" #include "Player.h" #include "RBAC.h" #include "SpellInfo.h" diff --git a/src/server/scripts/Commands/cs_lfg.cpp b/src/server/scripts/Commands/cs_lfg.cpp index 3cb094ba2e0..e70304240cb 100644 --- a/src/server/scripts/Commands/cs_lfg.cpp +++ b/src/server/scripts/Commands/cs_lfg.cpp @@ -25,7 +25,6 @@ #include "Language.h" #include "LFGMgr.h" #include "ObjectAccessor.h" -#include "ObjectMgr.h" #include "Player.h" #include "RBAC.h" diff --git a/src/server/scripts/Commands/cs_mmaps.cpp b/src/server/scripts/Commands/cs_mmaps.cpp index 15cd88eee88..fb817c5cf51 100644 --- a/src/server/scripts/Commands/cs_mmaps.cpp +++ b/src/server/scripts/Commands/cs_mmaps.cpp @@ -29,7 +29,6 @@ #include "ChatCommand.h" #include "DisableMgr.h" #include "GridNotifiersImpl.h" -#include "Map.h" #include "MMapFactory.h" #include "PathGenerator.h" #include "PhasingHandler.h" diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index fd1748bab37..7f24788c115 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -34,7 +34,6 @@ EndScriptData */ #include "Player.h" #include "RBAC.h" #include "ReputationMgr.h" -#include "SpellMgr.h" #include "SpellPackets.h" #include "UpdateFields.h" #include "WorldSession.h" diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 4e0ce23949e..24dc0ded865 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -32,7 +32,6 @@ EndScriptData */ #include "FollowMovementGenerator.h" #include "GameTime.h" #include "Language.h" -#include "Log.h" #include "Map.h" #include "MotionMaster.h" #include "MovementDefines.h" diff --git a/src/server/scripts/Commands/cs_pet.cpp b/src/server/scripts/Commands/cs_pet.cpp index 144527bc7bf..bc60a0ce43d 100644 --- a/src/server/scripts/Commands/cs_pet.cpp +++ b/src/server/scripts/Commands/cs_pet.cpp @@ -19,10 +19,8 @@ #include "Chat.h" #include "ChatCommand.h" #include "Language.h" -#include "Log.h" #include "Map.h" #include "Pet.h" -#include "ObjectMgr.h" #include "Player.h" #include "RBAC.h" #include "SpellMgr.h" diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp index 8659e04464c..c78a58d6f78 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "blackrock_caverns.h" #include "ScriptedCreature.h" -#include "Spell.h" #include "SpellAuras.h" #include "SpellScript.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp index 8230603030a..69e84081c8f 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp @@ -21,7 +21,6 @@ #include "InstanceScript.h" #include "Log.h" #include "Map.h" -#include "MotionMaster.h" #include "ScriptedCreature.h" #include <sstream> diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp index 1675fa79b0b..1717f2b3f86 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp @@ -24,7 +24,6 @@ EndScriptData */ #include "ScriptMgr.h" #include "molten_core.h" -#include "ObjectMgr.h" #include "ScriptedCreature.h" enum Spells diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp index 6d8624e45fe..07c9f7c029f 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp @@ -24,7 +24,6 @@ EndScriptData */ #include "ScriptMgr.h" #include "molten_core.h" -#include "ObjectMgr.h" #include "ScriptedCreature.h" enum Spells diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp index 3561b0e8b9e..c87c5ed0e35 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp @@ -24,7 +24,6 @@ EndScriptData */ #include "ScriptMgr.h" #include "molten_core.h" -#include "ObjectMgr.h" #include "ScriptedCreature.h" enum Spells diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp index 16ffde7c475..290c6c0811e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp @@ -24,7 +24,6 @@ EndScriptData */ #include "ScriptMgr.h" #include "molten_core.h" -#include "ObjectMgr.h" #include "ScriptedCreature.h" enum Spells diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp index 9b575fd34a9..13d51bbe432 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp @@ -15,7 +15,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ScriptMgr.h" #include "deadmines.h" void AddSC_deadmines() diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index 1255409178f..41a9bdae0aa 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -20,7 +20,6 @@ #include "GameObject.h" #include "gnomeregan.h" #include "InstanceScript.h" -#include "Log.h" #include "Map.h" #include <sstream> diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index cd7590f1b42..9438841c464 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -25,7 +25,6 @@ EndScriptData */ #include "ScriptMgr.h" #include "karazhan.h" #include "InstanceScript.h" -#include "GameObject.h" #include "Item.h" #include "MotionMaster.h" #include "ObjectAccessor.h" diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 01fb56d5d52..8f03e281c0c 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -16,7 +16,6 @@ */ #include "ScriptMgr.h" -#include "GameObject.h" #include "InstanceScript.h" #include "magisters_terrace.h" #include "MotionMaster.h" diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index 41adbc63c04..93ba71d0f30 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -23,7 +23,6 @@ #include "magisters_terrace.h" #include "Map.h" #include "MotionMaster.h" -#include "ObjectAccessor.h" #include "TemporarySummon.h" #include <sstream> diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index a51a990dcd7..abf6504470f 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -28,9 +28,8 @@ #include "ObjectAccessor.h" #include "PassiveAI.h" #include "Player.h" -#include "ScriptedEscortAI.h" +#include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "Spell.h" #include "SpellScript.h" #include "SpellInfo.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 3e5f1f3654e..557d8eb51af 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -21,7 +21,7 @@ #include "MotionMaster.h" #include "ObjectAccessor.h" #include "Player.h" -#include "ScriptedEscortAI.h" +#include "ScriptedCreature.h" #include "SpellScript.h" enum BloodyBreakoutTexts diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp index cadce44d648..85d5f0e34de 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp @@ -19,7 +19,6 @@ #include "MotionMaster.h" #include "PassiveAI.h" #include "Player.h" -#include "ScriptedCreature.h" #include "TemporarySummon.h" /*#### diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp index 4937a8d65fa..9ae4dfa0b90 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp @@ -20,7 +20,6 @@ #include "MotionMaster.h" #include "ScriptedCreature.h" #include "ScriptMgr.h" -#include "SpellAuras.h" #include "SpellInfo.h" #include "Timer.h" diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index 74daf8a031b..23377bf115d 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -17,7 +17,6 @@ #include "scarlet_monastery.h" #include "Creature.h" -#include "GameObject.h" #include "InstanceScript.h" #include "Map.h" #include "ScriptMgr.h" diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp index 39b658f700e..3ac642b58fe 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -20,7 +20,6 @@ #include "GameObjectAI.h" #include "InstanceScript.h" #include "MotionMaster.h" -#include "MoveSplineInit.h" #include "ObjectAccessor.h" #include "Player.h" #include "scholomance.h" diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index 4bbba1d1a85..cbaff8dfd3e 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -19,7 +19,6 @@ #include "GameObject.h" #include "InstanceScript.h" #include "Map.h" -#include "Player.h" #include "scholomance.h" Position const GandlingLoc = { 180.7712f, -5.428603f, 75.57024f, 1.291544f }; diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp index d09f974bda0..5bb5f1431e9 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp @@ -31,7 +31,6 @@ EndContentData */ #include "GameObjectAI.h" #include "InstanceScript.h" #include "Player.h" -#include "ScriptedCreature.h" #include "sunken_temple.h" /*##### diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp index a583555a460..a7e7e910b41 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp @@ -26,8 +26,6 @@ npc_prophet_velen npc_captain_selana EndContentData */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "sunwell_plateau.h" /*###### diff --git a/src/server/scripts/EasternKingdoms/TheStockade/boss_hogger.cpp b/src/server/scripts/EasternKingdoms/TheStockade/boss_hogger.cpp index 4d822a1eb0d..b3d815dc329 100644 --- a/src/server/scripts/EasternKingdoms/TheStockade/boss_hogger.cpp +++ b/src/server/scripts/EasternKingdoms/TheStockade/boss_hogger.cpp @@ -15,7 +15,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "InstanceScript.h" #include "MotionMaster.h" #include "ScriptedCreature.h" #include "ScriptMgr.h" diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp index 166898c8213..39e8b0a18c4 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp @@ -30,7 +30,6 @@ EndContentData */ #include "GameObjectAI.h" #include "InstanceScript.h" #include "Player.h" -#include "ScriptedCreature.h" #include "uldaman.h" /*###### diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index bb525f0d645..777523fb12b 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -23,8 +23,6 @@ #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "SpellScript.h" #include "zulaman.h" enum Says diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp index b7cf1d00a64..9dd8abab90a 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp @@ -15,7 +15,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ObjectMgr.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "zulgurub.h" diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp index e9690bebf74..262425ba23c 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp @@ -15,10 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ObjectMgr.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "Spell.h" #include "zulgurub.h" enum Yells diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index 16726dc301b..88f7d6460a8 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -16,10 +16,8 @@ */ #include "zulgurub.h" -#include "ObjectMgr.h" #include "ScriptedCreature.h" #include "ScriptMgr.h" -#include "Spell.h" enum Yells { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp index 14a015c2802..debb07f15c5 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp @@ -15,7 +15,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ObjectMgr.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "zulgurub.h" diff --git a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp index 66e48158ad2..a732a304556 100644 --- a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp @@ -21,8 +21,6 @@ Quest support: 3628. */ #include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" #include "SpellScript.h" #include "Player.h" #include "Group.h" diff --git a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp index 153daabd615..78f3d722b72 100644 --- a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp @@ -27,8 +27,8 @@ EndContentData */ #include "ScriptMgr.h" #include "MotionMaster.h" -#include "Player.h" -#include "ScriptedEscortAI.h" +#include "Position.h" +#include "ScriptedCreature.h" /*###### ## npc_sharpbeak used by Entrys 43161 & 51125 diff --git a/src/server/scripts/EasternKingdoms/zone_ironforge.cpp b/src/server/scripts/EasternKingdoms/zone_ironforge.cpp index d04d690bfe5..2e2596f745f 100644 --- a/src/server/scripts/EasternKingdoms/zone_ironforge.cpp +++ b/src/server/scripts/EasternKingdoms/zone_ironforge.cpp @@ -15,11 +15,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ScriptMgr.h" -#include "ScriptedCreature.h" -#include "ScriptedGossip.h" -#include "Player.h" - void AddSC_ironforge() { } diff --git a/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp index 81661015ca5..064d3783667 100644 --- a/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp +++ b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp @@ -22,7 +22,6 @@ SDComment: Script Data End */ #include "ScriptMgr.h" -#include "Player.h" #include "ScriptedCreature.h" #include "MotionMaster.h" #include "ObjectAccessor.h" diff --git a/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp b/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp index f1146f0a60e..6f79f9cf106 100644 --- a/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp +++ b/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp @@ -17,7 +17,6 @@ #include "ScriptMgr.h" #include "Battlefield.h" -#include "BattlefieldMgr.h" #include "Battlefield/BattlefieldTB.h" #include "DB2Stores.h" #include "ObjectMgr.h" @@ -26,7 +25,6 @@ #include "ScriptedGossip.h" #include "ScriptSystem.h" #include "SpellScript.h" -#include "WorldSession.h" enum TBSpiritGuide { diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index 41e1942865b..da61f3681dd 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -32,7 +32,6 @@ EndContentData */ #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" -#include "ScriptedGossip.h" /*###### ## npc_lady_sylvanas_windrunner diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index abd633961c7..3dd27aa8ad1 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -22,7 +22,6 @@ #include "GameObjectAI.h" #include "Player.h" #include "ScriptedEscortAI.h" -#include "ScriptedGossip.h" #include "SpellScript.h" enum Spells diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 729ed9a3d46..516afac3cbd 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -22,7 +22,6 @@ SDComment: SDCategory: Caverns of Time, Mount Hyjal EndScriptData */ -#include "ScriptMgr.h" #include "CellImpl.h" #include "GridNotifiersImpl.h" #include "hyjal_trash.h" diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index a6c5aee0368..89a948921ba 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "hyjal.h" #include "hyjal_trash.h" -#include "hyjalAI.h" #include "InstanceScript.h" #include "MotionMaster.h" #include "ObjectAccessor.h" diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h index fa48cb4271a..2f5e6fcb4c8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h @@ -18,7 +18,6 @@ #ifndef SC_HYJAL_TRASH_AI_H #define SC_HYJAL_TRASH_AI_H -#include "hyjal.h" #include "ScriptedEscortAI.h" struct hyjal_trashAI : public EscortAI diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index 149c3765f84..8dd011c4e85 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -18,13 +18,9 @@ #include "culling_of_stratholme.h" #include "InstanceScript.h" #include "Map.h" -#include "MotionMaster.h" -#include "ObjectAccessor.h" #include "PassiveAI.h" -#include "Player.h" #include "ScriptedCreature.h" #include "ScriptMgr.h" -#include "SpellMgr.h" enum Spells { 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 60342a92b6a..768292130ba 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -17,6 +17,7 @@ #include "culling_of_stratholme.h" #include "AreaBoundary.h" +#include "EventMap.h" #include "DB2Structure.h" #include "GameObject.h" #include "GameTime.h" @@ -27,11 +28,10 @@ #include "PassiveAI.h" #include "Player.h" #include "QuestDef.h" -#include "ScriptedEscortAI.h" #include "ScriptedGossip.h" +#include "ScriptMgr.h" #include "SmartAI.h" #include "SpellInfo.h" -#include "ScriptMgr.h" #include "SplineChainMovementGenerator.h" #include "StringFormat.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index e086a924e32..77b7d9d049a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -23,7 +23,6 @@ #include "GameTime.h" #include "InstanceScript.h" #include "Map.h" -#include "MotionMaster.h" #include "Log.h" #include "Player.h" #include "ScriptMgr.h" diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index 1fbac51eab0..b5ffc37d724 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -28,7 +28,7 @@ EndScriptData */ #include "InstanceScript.h" #include "MotionMaster.h" #include "old_hillsbrad.h" -#include "ScriptedEscortAI.h" +#include "ScriptedCreature.h" /*###### ## go_barrel_old_hillsbrad diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp index bc532867f84..2824b328887 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp @@ -28,7 +28,6 @@ Category: Caverns of Time, The Black Morass #include "Log.h" #include "Map.h" #include "Player.h" -#include "SpellInfo.h" #include "the_black_morass.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp index 175f1af3039..56e3288c274 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -20,9 +20,7 @@ #include "Log.h" #include "Map.h" #include "ObjectAccessor.h" -#include "Player.h" #include "ScriptedCreature.h" -#include "ScriptedGossip.h" #include "SpellInfo.h" #include "the_black_morass.h" diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp index 993f7c69e4f..5b79934cc08 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp @@ -19,7 +19,6 @@ #include "GridNotifiers.h" #include "halls_of_origination.h" #include "InstanceScript.h" -#include "Map.h" #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index f78886a0c7e..8c191ea7431 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -35,7 +35,6 @@ EndContentData */ #include "Player.h" #include "razorfen_downs.h" #include "ScriptedCreature.h" -#include "ScriptedGossip.h" #include "TemporarySummon.h" /*### diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index 470908d9a5d..f60770f84eb 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -25,7 +25,6 @@ EndScriptData */ #include "ScriptMgr.h" #include "GameObject.h" #include "InstanceScript.h" -#include "Log.h" #include "Map.h" #include "razorfen_kraul.h" diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index 52144a698ee..26c78f7286e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -24,7 +24,6 @@ EndScriptData */ #include "ScriptMgr.h" #include "InstanceScript.h" -#include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "temple_of_ahnqiraj.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index eb829371e7b..095a3e67b24 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -25,7 +25,6 @@ EndScriptData */ #include "ScriptMgr.h" #include "InstanceScript.h" #include "MotionMaster.h" -#include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "SpellInfo.h" #include "temple_of_ahnqiraj.h" diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp index a2d832bfb88..321f94d1e9e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "InstanceScript.h" #include "MotionMaster.h" -#include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "SpellInfo.h" #include "temple_of_ahnqiraj.h" 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 8e33bbe0573..7b25f5bec46 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -23,7 +23,6 @@ SDCategory: Temple of Ahn'Qiraj EndScriptData */ #include "ScriptMgr.h" -#include "Creature.h" #include "InstanceScript.h" #include "temple_of_ahnqiraj.h" diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index 370f5c0d9d9..62d6dc8ecec 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -33,7 +33,6 @@ EndContentData */ #include "CellImpl.h" #include "GameObjectAI.h" #include "GridNotifiersImpl.h" -#include "Log.h" #include "MotionMaster.h" #include "ObjectAccessor.h" #include "ScriptedEscortAI.h" diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp index fba81efcec6..728f988c3ea 100644 --- a/src/server/scripts/Kalimdor/zone_desolace.cpp +++ b/src/server/scripts/Kalimdor/zone_desolace.cpp @@ -30,7 +30,7 @@ EndContentData */ #include "GameObjectAI.h" #include "MotionMaster.h" #include "Player.h" -#include "ScriptedEscortAI.h" +#include "ScriptedCreature.h" #include "ScriptedGossip.h" #include "SpellInfo.h" diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp index b707e15035a..716f78300b9 100644 --- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp @@ -26,7 +26,6 @@ EndScriptData */ EndContentData */ #include "ScriptMgr.h" -#include "MotionMaster.h" #include "Player.h" #include "QuestDef.h" #include "ScriptedCreature.h" diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index 3d1af018a97..d664bc8a0d5 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -19,7 +19,7 @@ #include "GameObject.h" #include "MotionMaster.h" #include "Player.h" -#include "ScriptedEscortAI.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" /*#### diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp index 001279fd17c..7e97a7ee392 100644 --- a/src/server/scripts/Kalimdor/zone_tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp @@ -29,9 +29,7 @@ EndContentData */ #include "MotionMaster.h" #include "ObjectAccessor.h" #include "Player.h" -#include "ScriptedEscortAI.h" #include "ScriptedFollowerAI.h" -#include "ScriptedGossip.h" /*#### # npc_tooga diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 5ef91dfaac6..ca0299b2b91 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -31,7 +31,6 @@ EndContentData */ #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedEscortAI.h" -#include "ScriptedGossip.h" #include "SpellInfo.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp index e21d634a1fa..30e1a276f68 100644 --- a/src/server/scripts/Kalimdor/zone_winterspring.cpp +++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp @@ -35,7 +35,6 @@ EndContentData */ #include "Player.h" #include "ScriptedEscortAI.h" #include "TemporarySummon.h" -#include "WorldSession.h" enum Says { diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp index 3facde1d0b1..5bb168d4ffc 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp @@ -21,7 +21,6 @@ #include "Map.h" #include "MotionMaster.h" #include "ScriptedCreature.h" -#include "Spell.h" #include "SpellScript.h" #include "stonecore.h" 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 2e65cd7d4f5..37bd09ccc62 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -28,7 +28,6 @@ #include "Player.h" #include "ScriptedCreature.h" #include "SpellInfo.h" -#include "SpellMgr.h" #include "TemporarySummon.h" enum Spells diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index b9961ed76df..ce04929e26a 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -21,7 +21,6 @@ #include "MotionMaster.h" #include "ObjectAccessor.h" #include "ScriptedCreature.h" -#include "Spell.h" #include "SpellScript.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index ae9e00725bd..6f62faf3bc6 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -25,7 +25,6 @@ #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" -#include "Spell.h" #include "SpellScript.h" enum Spells diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp index 9e14a09ed3c..b4d2c18f9ea 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp @@ -21,7 +21,6 @@ #include "Player.h" #include "ruby_sanctum.h" #include "ScriptedCreature.h" -#include "ScriptedGossip.h" #include "SpellScript.h" enum Texts diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index cc5975f29e7..6c3aa8bf6e4 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -26,7 +26,6 @@ EndScriptData */ #include "CreatureAI.h" #include "GameObject.h" #include "InstanceScript.h" -#include "Log.h" #include "Map.h" #include "MotionMaster.h" #include "Player.h" diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index 60f72b8608f..bbce73d9b82 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "GridNotifiers.h" #include "InstanceScript.h" -#include "Map.h" #include "MotionMaster.h" #include "ObjectAccessor.h" #include "Player.h" diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index c6bdd4fb258..c6b564e9f5a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -24,7 +24,6 @@ #include "GridNotifiersImpl.h" #include "InstanceScript.h" #include "MotionMaster.h" -#include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" #include "SpellAuraEffects.h" diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index ffc8272bbf1..d9190a6ed5a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -20,7 +20,6 @@ #include "InstanceScript.h" #include "Map.h" #include "MotionMaster.h" -#include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index cd968cec2bb..d595f6a8f35 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -27,7 +27,6 @@ #include "ScriptedCreature.h" #include "ScriptedGossip.h" #include "ScriptMgr.h" -#include "Spell.h" #include "SpellInfo.h" #include "SpellScript.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index d556818d1fb..139eb11e125 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -20,7 +20,6 @@ #include "ScriptedCreature.h" #include "SpellInfo.h" #include "SpellScript.h" -#include "gundrak.h" enum Spells { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index 1a53a88c7b3..e89adb639e2 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -24,7 +24,6 @@ #include "Player.h" #include "ScriptedCreature.h" #include "ScriptMgr.h" -#include "Spell.h" #include "SpellAuraEffects.h" #include "SpellInfo.h" #include "SpellScript.h" diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index f1eb4de82ed..60446964f29 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -18,7 +18,6 @@ #include "icecrown_citadel.h" #include "CellImpl.h" #include "CreatureTextMgr.h" -#include "GossipDef.h" #include "GridNotifiersImpl.h" #include "InstanceScript.h" #include "Map.h" diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 026eac4d68b..3d676b29f7c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -24,7 +24,6 @@ #include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "ScriptMgr.h" -#include "Spell.h" #include "SpellAuraEffects.h" #include "SpellScript.h" #include "TemporarySummon.h" @@ -2854,4 +2853,4 @@ void AddSC_boss_the_lich_king() // Achievements new achievement_been_waiting_long_time(); new achievement_neck_deep_in_vile(); -}
\ No newline at end of file +} diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 0c2eab0338c..cf716797884 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -22,7 +22,6 @@ #include "ObjectAccessor.h" #include "PassiveAI.h" #include "ScriptedCreature.h" -#include "SpellScript.h" enum Spells { diff --git a/src/server/scripts/Northrend/Naxxramas/naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/naxxramas.cpp index a909153a2b7..522f1892cf4 100644 --- a/src/server/scripts/Northrend/Naxxramas/naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/naxxramas.cpp @@ -16,7 +16,6 @@ */ #include "ScriptMgr.h" -#include "InstanceScript.h" #include "MotionMaster.h" #include "MoveSpline.h" #include "MoveSplineInit.h" diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 0a72610fdc7..1c53e8b58c6 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -24,7 +24,6 @@ #include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "Spell.h" #include "SpellAuraEffects.h" #include "SpellScript.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index 978099325f0..af73f17cb97 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -26,7 +26,6 @@ #include "PassiveAI.h" #include "Player.h" #include "ScriptedCreature.h" -#include "Spell.h" #include "SpellInfo.h" #include "SpellScript.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index 06dc0c246b3..e90e7ba19da 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -17,8 +17,6 @@ #include "ScriptMgr.h" #include "InstanceScript.h" -#include "MotionMaster.h" -#include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "SpellAuras.h" #include "SpellScript.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index e5cf2b4ef18..de8224487da 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -28,7 +28,6 @@ #include "SpellAuraEffects.h" #include "SpellMgr.h" #include "SpellScript.h" -#include "TypeContainerVisitor.h" #include "ulduar.h" #include <G3D/Vector3.h> diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index 382f7b74555..e722a9b8546 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -16,11 +16,9 @@ */ #include "ScriptMgr.h" -#include "CombatLogPackets.h" #include "InstanceScript.h" #include "Map.h" #include "MotionMaster.h" -#include "ObjectAccessor.h" #include "PassiveAI.h" #include "ScriptedCreature.h" #include "SpellAuraEffects.h" diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 84bb4b1b933..e3af91dc6d0 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -27,7 +27,6 @@ EndScriptData */ #include "MotionMaster.h" #include "ObjectAccessor.h" #include "ScriptedCreature.h" -#include "Spell.h" #include "SpellScript.h" #include "utgarde_keep.h" diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index c3bab501e0e..5b281526844 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -16,7 +16,6 @@ */ #include "ScriptMgr.h" -#include "Containers.h" #include "GameObject.h" #include "InstanceScript.h" #include "Map.h" diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 077f54a3f5e..1f19e810e34 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -20,7 +20,6 @@ #include "GameObject.h" #include "MotionMaster.h" #include "ObjectAccessor.h" -#include "ObjectMgr.h" #include "PhasingHandler.h" #include "Player.h" #include "QuestDef.h" diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index fdce0371ed1..167b7c98dc9 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -30,7 +30,6 @@ Script Data End */ #include "MotionMaster.h" #include "Player.h" #include "ScriptedCreature.h" -#include "ScriptedGossip.h" /******************************************************* * npc_mageguard_dalaran diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index 6e616af9333..5623715c65c 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -29,9 +29,8 @@ EndContentData */ #include "CombatAI.h" #include "MotionMaster.h" #include "ObjectAccessor.h" -#include "ObjectMgr.h" #include "Player.h" -#include "ScriptedEscortAI.h" +#include "ScriptedCreature.h" #include "ScriptedGossip.h" #include "SpellInfo.h" #include "SpellScript.h" diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 732fbf5c45a..2590215091e 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -22,7 +22,6 @@ #include "QuestDef.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "ScriptedGossip.h" #include "SpellInfo.h" #include "SpellScript.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index 8f3ce98422e..127895e2d91 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -21,7 +21,6 @@ #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" -#include "ScriptedGossip.h" #include "SpellAuras.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index 946533454d4..20408b10697 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -28,7 +28,6 @@ #include "TemporarySummon.h" #include "Vehicle.h" #include "WorldSession.h" -#include "SpellMgr.h" ///////////////////// ///npc_injured_goblin diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 9432dab4685..ca4bca84ac4 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -21,7 +21,7 @@ #include "MotionMaster.h" #include "ObjectAccessor.h" #include "Player.h" -#include "ScriptedEscortAI.h" +#include "ScriptedCreature.h" #include "ScriptedGossip.h" #include "SpellAuraEffects.h" #include "SpellAuras.h" diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 4ad742cf4eb..64f2b53ac71 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -23,7 +23,6 @@ SDCategory: Auchindoun, Shadow Labyrinth EndScriptData */ #include "ScriptMgr.h" -#include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "shadow_labyrinth.h" #include "SpellScript.h" diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index fea9aabd29a..3ce7e4b3cf8 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -18,8 +18,6 @@ #include "ScriptMgr.h" #include "black_temple.h" -#include "Containers.h" -#include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "SpellScript.h" #include "SpellAuraEffects.h" diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 3d0dcddf3bf..f3185f545d6 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -19,10 +19,8 @@ #include "black_temple.h" #include "InstanceScript.h" #include "MotionMaster.h" -#include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" -#include "Spell.h" #include "SpellAuraEffects.h" #include "SpellScript.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index cce34c1081c..b694beef556 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "black_temple.h" #include "MotionMaster.h" -#include "ObjectAccessor.h" #include "PassiveAI.h" #include "ScriptedCreature.h" diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index 92e4e721113..f58e7f8d28f 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -26,7 +26,7 @@ EndScriptData */ #include "InstanceScript.h" #include "MotionMaster.h" #include "ObjectAccessor.h" -#include "ScriptedEscortAI.h" +#include "ScriptedCreature.h" #include "serpent_shrine.h" #include "TemporarySummon.h" 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 6add775b0f2..d76063f2b74 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -31,7 +31,6 @@ EndScriptData */ #include "Player.h" #include "ScriptedCreature.h" #include "serpent_shrine.h" -#include "Spell.h" #include "TemporarySummon.h" enum LadyVashj diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp index 54d7d9ba185..45c432f59ca 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp @@ -21,7 +21,6 @@ #include "GameObject.h" #include "GameObjectAI.h" #include "InstanceScript.h" -#include "Log.h" #include "steam_vault.h" struct go_main_chambers_access_panel : public GameObjectAI diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index d3adb9a5fcc..091d35ab20c 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -20,7 +20,6 @@ #include "GameObject.h" #include "GameObjectAI.h" #include "InstanceScript.h" -#include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index ee2fe53a546..974765b8f7e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -19,8 +19,6 @@ #include "blood_furnace.h" #include "ObjectAccessor.h" #include "ScriptedCreature.h" -#include "Spell.h" -#include "SpellAuras.h" #include "TemporarySummon.h" enum Kelidan diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index 785e334e49d..256c760f382 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -16,7 +16,6 @@ */ #include "ScriptMgr.h" -#include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "the_eye.h" diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp index c1b6020c8e6..6cdeb655cce 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -16,7 +16,6 @@ */ #include "ScriptMgr.h" -#include "GameObject.h" #include "InstanceScript.h" #include "mechanar.h" diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index 6067f4cd24b..70b94a9e0d8 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -27,12 +27,10 @@ npc_maghar_captive EndContentData */ #include "ScriptMgr.h" -#include "GameObject.h" #include "GameObjectAI.h" #include "MotionMaster.h" #include "Player.h" #include "ScriptedEscortAI.h" -#include "ScriptedGossip.h" #include "SpellInfo.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index 7e42aaa562f..02685b97dcf 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -27,13 +27,11 @@ npc_commander_dawnforge EndContentData */ #include "ScriptMgr.h" -#include "GameObject.h" #include "GameObjectAI.h" #include "Log.h" #include "ObjectAccessor.h" #include "Player.h" -#include "ScriptedEscortAI.h" -#include "ScriptedGossip.h" +#include "ScriptedCreature.h" /*###### ## npc_commander_dawnforge diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 7d0d67f7d00..270f05ec4ee 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -43,7 +43,6 @@ EndContentData */ #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedEscortAI.h" -#include "ScriptedGossip.h" #include "SpellInfo.h" #include "SpellScript.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp index 4a0fb8c11e7..a77e34f1fe2 100644 --- a/src/server/scripts/Outland/zone_terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp @@ -27,14 +27,11 @@ npc_unkor_the_ruthless EndContentData */ #include "ScriptMgr.h" -#include "GameObject.h" #include "Group.h" #include "Map.h" #include "Player.h" -#include "ScriptedEscortAI.h" -#include "Spell.h" +#include "ScriptedCreature.h" #include "SpellScript.h" -#include "WorldSession.h" /*###### ## npc_unkor_the_ruthless diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp index 902b6c45327..2f77f392ed9 100644 --- a/src/server/scripts/Pet/pet_dk.cpp +++ b/src/server/scripts/Pet/pet_dk.cpp @@ -25,7 +25,6 @@ #include "CombatAI.h" #include "GridNotifiersImpl.h" #include "MotionMaster.h" -#include "ScriptedCreature.h" enum DeathKnightSpells { diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp index d1cedaa0e69..3f678587a0b 100644 --- a/src/server/scripts/Pet/pet_mage.cpp +++ b/src/server/scripts/Pet/pet_mage.cpp @@ -26,7 +26,6 @@ #include "GridNotifiersImpl.h" #include "MotionMaster.h" #include "Pet.h" -#include "PetAI.h" #include "ScriptedCreature.h" enum MageSpells diff --git a/src/server/scripts/Pet/pet_priest.cpp b/src/server/scripts/Pet/pet_priest.cpp index 57a5e4ea979..775ac6eb46a 100644 --- a/src/server/scripts/Pet/pet_priest.cpp +++ b/src/server/scripts/Pet/pet_priest.cpp @@ -21,9 +21,9 @@ */ #include "ScriptMgr.h" +#include "Creature.h" #include "PassiveAI.h" #include "PetAI.h" -#include "ScriptedCreature.h" enum PriestSpells { diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index bdb8ff18061..4661db4d0db 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -27,7 +27,6 @@ #include "Player.h" #include "SpellAuraEffects.h" #include "SpellHistory.h" -#include "SpellMgr.h" #include "SpellScript.h" #include <numeric> diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index ec786ac09bc..23905a2bfe2 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -23,7 +23,6 @@ #include "ScriptMgr.h" #include "Containers.h" -#include "Map.h" #include "Player.h" #include "Spell.h" #include "SpellAuraEffects.h" diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 9372d91197b..ca962cc005f 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -27,7 +27,6 @@ #include "Pet.h" #include "SpellAuraEffects.h" #include "SpellHistory.h" -#include "SpellMgr.h" #include "SpellScript.h" enum HunterSpells diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 355155d67ed..60cd50b0abd 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -24,6 +24,8 @@ #include "ScriptMgr.h" #include "AzeritePackets.h" #include "Battleground.h" +#include "Containers.h" +#include "Creature.h" #include "CreatureAIImpl.h" #include "DB2Stores.h" #include "Item.h" @@ -33,7 +35,6 @@ #include "ObjectMgr.h" #include "Player.h" #include "Random.h" -#include "ScriptedCreature.h" #include "SkillDiscovery.h" #include "Spell.h" #include "SpellAuraEffects.h" diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index 2edf4ab1120..b521f4c4d30 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -17,7 +17,6 @@ #include "ScriptMgr.h" #include "MotionMaster.h" -#include "ObjectAccessor.h" #include "PassiveAI.h" #include "ScriptedCreature.h" #include "SpellInfo.h" diff --git a/src/server/scripts/World/conversation_scripts.cpp b/src/server/scripts/World/conversation_scripts.cpp index 6d5de609e63..0c6387a1f8d 100644 --- a/src/server/scripts/World/conversation_scripts.cpp +++ b/src/server/scripts/World/conversation_scripts.cpp @@ -17,7 +17,6 @@ #include "ScriptMgr.h" #include "Conversation.h" -#include "ObjectAccessor.h" #include "Player.h" class conversation_allied_race_dk_defender_of_azeroth : public ConversationScript diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 51fdae16168..bda1039ea14 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -46,7 +46,6 @@ EndContentData */ #include "ScriptedGossip.h" #include "TemporarySummon.h" #include "WorldSession.h" -#include "World.h" /*###### ## go_gilded_brazier (Paladin First Trail quest (9678)) @@ -1471,4 +1470,4 @@ void AddSC_go_scripts() new go_darkmoon_faire_music(); new go_pirate_day_music(); new go_bells(); -}
\ No newline at end of file +} diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp index e7a0aeb1770..b4817c81523 100644 --- a/src/server/scripts/World/mob_generic_creature.cpp +++ b/src/server/scripts/World/mob_generic_creature.cpp @@ -16,9 +16,9 @@ */ #include "ScriptMgr.h" +#include "Creature.h" #include "Map.h" #include "PassiveAI.h" -#include "ScriptedCreature.h" #include "SpellInfo.h" #include "SpellMgr.h" diff --git a/src/server/shared/Dynamic/FactoryHolder.h b/src/server/shared/Dynamic/FactoryHolder.h index c3d9901c1ef..73812bf8842 100644 --- a/src/server/shared/Dynamic/FactoryHolder.h +++ b/src/server/shared/Dynamic/FactoryHolder.h @@ -20,7 +20,6 @@ #include "Define.h" #include "ObjectRegistry.h" -#include "TypeList.h" /** FactoryHolder holds a factory object of a specific type */ diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h index 8e501db9eef..9401784e1a8 100644 --- a/src/server/shared/Dynamic/ObjectRegistry.h +++ b/src/server/shared/Dynamic/ObjectRegistry.h @@ -18,11 +18,8 @@ #ifndef TRINITY_OBJECTREGISTRY_H #define TRINITY_OBJECTREGISTRY_H -#include "Define.h" - #include <string> #include <map> -#include <vector> #include <memory> /** ObjectRegistry holds all registry item of the same type diff --git a/src/server/shared/Networking/NetworkThread.h b/src/server/shared/Networking/NetworkThread.h index 5f9071af656..40af233831e 100644 --- a/src/server/shared/Networking/NetworkThread.h +++ b/src/server/shared/Networking/NetworkThread.h @@ -23,13 +23,10 @@ #include "Errors.h" #include "IoContext.h" #include "Log.h" -#include "Timer.h" #include <boost/asio/ip/tcp.hpp> #include <atomic> -#include <chrono> #include <memory> #include <mutex> -#include <set> #include <thread> using boost::asio::ip::tcp; diff --git a/src/server/shared/Secrets/SecretMgr.cpp b/src/server/shared/Secrets/SecretMgr.cpp index de3794a148e..82c8d2e395c 100644 --- a/src/server/shared/Secrets/SecretMgr.cpp +++ b/src/server/shared/Secrets/SecretMgr.cpp @@ -23,8 +23,6 @@ #include "DatabaseEnv.h" #include "Errors.h" #include "Log.h" -#include <functional> -#include <unordered_map> #define SECRET_FLAG_FOR(key, val, server) server ## _ ## key = (val ## ull << (16*SECRET_OWNER_ ## server)) #define SECRET_FLAG(key, val) SECRET_FLAG_ ## key = val, SECRET_FLAG_FOR(key, val, BNETSERVER), SECRET_FLAG_FOR(key, val, WORLDSERVER) diff --git a/src/server/worldserver/RemoteAccess/RASession.h b/src/server/worldserver/RemoteAccess/RASession.h index d499727ae9d..65ef6b414be 100644 --- a/src/server/worldserver/RemoteAccess/RASession.h +++ b/src/server/worldserver/RemoteAccess/RASession.h @@ -21,7 +21,6 @@ #include <memory> #include <boost/asio/ip/tcp.hpp> #include <boost/asio/streambuf.hpp> -#include "Common.h" #include <future> diff --git a/src/server/worldserver/TCSoap/TCSoap.h b/src/server/worldserver/TCSoap/TCSoap.h index be680eb4ba2..b8be9ba4cd8 100644 --- a/src/server/worldserver/TCSoap/TCSoap.h +++ b/src/server/worldserver/TCSoap/TCSoap.h @@ -19,7 +19,6 @@ #define _TCSOAP_H #include "Define.h" -#include <mutex> #include <future> #include <string> diff --git a/src/tools/extractor_common/CascHandles.h b/src/tools/extractor_common/CascHandles.h index cf40020feb6..51f781a49f9 100644 --- a/src/tools/extractor_common/CascHandles.h +++ b/src/tools/extractor_common/CascHandles.h @@ -20,7 +20,6 @@ #include "Define.h" #include <CascPort.h> -#include <memory> namespace boost { diff --git a/src/tools/map_extractor/loadlib/loadlib.h b/src/tools/map_extractor/loadlib/loadlib.h index 5e6c5285b38..aadf8cc8724 100644 --- a/src/tools/map_extractor/loadlib/loadlib.h +++ b/src/tools/map_extractor/loadlib/loadlib.h @@ -21,6 +21,7 @@ #include "Define.h" #include "CascHandles.h" #include <map> +#include <memory> #include <string> #define FILE_FORMAT_VERSION 18 diff --git a/src/tools/mmaps_generator/IntermediateValues.h b/src/tools/mmaps_generator/IntermediateValues.h index 0772dfef402..c9bbd1d7d73 100644 --- a/src/tools/mmaps_generator/IntermediateValues.h +++ b/src/tools/mmaps_generator/IntermediateValues.h @@ -18,10 +18,8 @@ #ifndef _INTERMEDIATE_VALUES_H #define _INTERMEDIATE_VALUES_H -#include "PathCommon.h" -#include "TerrainBuilder.h" #include "Recast.h" -#include "DetourNavMesh.h" +#include "TerrainBuilder.h" namespace MMAP { diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index aa2c7ad4b8f..6e3142f2868 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -17,12 +17,12 @@ #include "MapBuilder.h" #include "Containers.h" +#include "IntermediateValues.h" #include "MapTree.h" #include "MMapDefines.h" #include "ModelInstance.h" #include "PathCommon.h" #include "StringFormat.h" -#include <DetourCommon.h> #include <DetourNavMesh.h> #include <DetourNavMeshBuilder.h> #include <climits> diff --git a/src/tools/mmaps_generator/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h index 8bd299efd67..9e0927a32ae 100644 --- a/src/tools/mmaps_generator/MapBuilder.h +++ b/src/tools/mmaps_generator/MapBuilder.h @@ -20,13 +20,11 @@ #include <vector> #include <set> -#include <map> #include <list> #include <atomic> #include <thread> #include "TerrainBuilder.h" -#include "IntermediateValues.h" #include "Recast.h" #include "DetourNavMesh.h" diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index 1c40ad5bee4..ffae6eb2b29 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -23,6 +23,7 @@ #include "ModelInstance.h" #include "Util.h" #include "VMapManager2.h" +#include <map> namespace MMAP { diff --git a/src/tools/mmaps_generator/TerrainBuilder.h b/src/tools/mmaps_generator/TerrainBuilder.h index a41cc705df5..83e32dfef41 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.h +++ b/src/tools/mmaps_generator/TerrainBuilder.h @@ -23,7 +23,6 @@ #include <G3D/Array.h> #include <G3D/Vector3.h> -#include <G3D/Matrix3.h> enum class map_liquidHeaderTypeFlags : uint8; diff --git a/src/tools/vmap4_extractor/adtfile.cpp b/src/tools/vmap4_extractor/adtfile.cpp index b643fdf40ae..bab83bd7cfa 100644 --- a/src/tools/vmap4_extractor/adtfile.cpp +++ b/src/tools/vmap4_extractor/adtfile.cpp @@ -18,7 +18,6 @@ #include "vmapexport.h" #include "adtfile.h" #include "StringFormat.h" -#include <algorithm> #include <cstdio> #include "Errors.h" diff --git a/src/tools/vmap4_extractor/cascfile.h b/src/tools/vmap4_extractor/cascfile.h index e0f67499bcc..53193c931a5 100644 --- a/src/tools/vmap4_extractor/cascfile.h +++ b/src/tools/vmap4_extractor/cascfile.h @@ -25,6 +25,7 @@ #include "Define.h" #include "CascHandles.h" +#include <memory> #include <string> #include <utility> diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp index 737f774bead..ebbe37efdd7 100644 --- a/src/tools/vmap4_extractor/vmapexport.cpp +++ b/src/tools/vmap4_extractor/vmapexport.cpp @@ -30,7 +30,6 @@ #include <CascLib.h> #include <boost/filesystem/operations.hpp> #include <fstream> -#include <iostream> #include <list> #include <map> #include <unordered_map> diff --git a/src/tools/vmap4_extractor/wmo.h b/src/tools/vmap4_extractor/wmo.h index f5f364d2302..5ba69c8b49b 100644 --- a/src/tools/vmap4_extractor/wmo.h +++ b/src/tools/vmap4_extractor/wmo.h @@ -18,11 +18,11 @@ #ifndef WMO_H #define WMO_H +#include "vec3d.h" +#include <memory> #include <string> #include <unordered_set> #include <vector> -#include "vec3d.h" -#include "cascfile.h" // MOPY flags enum MopyFlags |