From f1111be15287176e57126231fe60d6ec5030fbfd Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Sun, 17 Sep 2023 15:19:09 +0200 Subject: [PATCH] chore(misc): cleanup (#17274) --- src/cmake/macros/FindOpenSSL.cmake | 2 +- src/common/Collision/Maps/MapDefines.h | 16 ++++++++++++++-- src/common/GitRevision.cpp | 18 +++++++++++++++--- src/common/GitRevision.h | 18 +++++++++++++++--- src/common/Utilities/EnumFlag.h | 16 ++++++++++++++-- src/common/Utilities/TaskScheduler.cpp | 16 ++++++++++++++-- src/common/Utilities/TaskScheduler.h | 16 ++++++++++++++-- .../game/Battlegrounds/BattlegroundScore.h | 2 +- src/server/game/Miscellaneous/Language.h | 2 +- src/server/game/Movement/Spline/MoveSpline.h | 6 +++--- .../game/Movement/Spline/MoveSplineFlag.h | 6 +++--- .../game/Movement/Spline/MoveSplineInit.h | 6 +++--- .../game/Movement/Spline/MoveSplineInitArgs.h | 6 +++--- .../Movement/Spline/MovementPacketBuilder.h | 6 +++--- .../game/Movement/Spline/MovementTypedefs.h | 6 +++--- src/server/game/Movement/Spline/Spline.h | 6 +++--- .../scripts/Kalimdor/ZulFarrak/zulfarrak.cpp | 17 ++++++++++++++--- .../underbog/instance_the_underbog.cpp | 8 ++++---- 18 files changed, 128 insertions(+), 45 deletions(-) diff --git a/src/cmake/macros/FindOpenSSL.cmake b/src/cmake/macros/FindOpenSSL.cmake index f40a591f9..fb1651e6d 100644 --- a/src/cmake/macros/FindOpenSSL.cmake +++ b/src/cmake/macros/FindOpenSSL.cmake @@ -575,7 +575,7 @@ if(OPENSSL_FOUND) include(EnsureVersion) ENSURE_VERSION("${OPENSSL_EXPECTED_VERSION}" "${OPENSSL_VERSION}" OPENSSL_VERSION_OK) if(NOT OPENSSL_VERSION_OK) - message(FATAL_ERROR "TrinityCore needs OpenSSL version ${OPENSSL_EXPECTED_VERSION} but found too new version ${OPENSSL_VERSION}. TrinityCore needs OpenSSL 1.0.x or 1.1.x to work properly. If you still have problems please install OpenSSL 1.0.x if you still have problems search on forum for TCE00022") + message(FATAL_ERROR "AzerothCore needs OpenSSL version ${OPENSSL_EXPECTED_VERSION} but found too new version ${OPENSSL_VERSION}. AzerothCore needs OpenSSL 1.0.x or 1.1.x to work properly. If you still have problems please install OpenSSL 1.0.x if you still have problems search on forum for TCE00022") endif() if(NOT TARGET OpenSSL::Crypto AND diff --git a/src/common/Collision/Maps/MapDefines.h b/src/common/Collision/Maps/MapDefines.h index 94f926c8c..6772a20c7 100644 --- a/src/common/Collision/Maps/MapDefines.h +++ b/src/common/Collision/Maps/MapDefines.h @@ -1,6 +1,18 @@ /* - * Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 - * Copyright (C) 2008+ TrinityCore + * This file is part of the AzerothCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Affero General Public License as published by the + * Free Software Foundation; either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ #ifndef _MAPDEFINES_H diff --git a/src/common/GitRevision.cpp b/src/common/GitRevision.cpp index 9510a0f0d..4bfdffe7c 100644 --- a/src/common/GitRevision.cpp +++ b/src/common/GitRevision.cpp @@ -1,7 +1,19 @@ /* -* Copyright (C) 2016+ AzerothCore , released under GNU GPL v2 license, you may redistribute it and/or modify it under version 2 of the License, or (at your option), any later version. -* Copyright (C) 2008-2016 TrinityCore -*/ + * This file is part of the AzerothCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Affero General Public License as published by the + * Free Software Foundation; either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ #include "GitRevision.h" #include "revision.h" diff --git a/src/common/GitRevision.h b/src/common/GitRevision.h index ececc723a..34d0d9922 100644 --- a/src/common/GitRevision.h +++ b/src/common/GitRevision.h @@ -1,7 +1,19 @@ /* -* Copyright (C) 2016+ AzerothCore , released under GNU GPL v2 license, you may redistribute it and/or modify it under version 2 of the License, or (at your option), any later version. -* Copyright (C) 2008-2018 TrinityCore -*/ + * This file is part of the AzerothCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Affero General Public License as published by the + * Free Software Foundation; either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ #ifndef __GITREVISION_H__ #define __GITREVISION_H__ diff --git a/src/common/Utilities/EnumFlag.h b/src/common/Utilities/EnumFlag.h index b9fc9168e..d02232cfc 100644 --- a/src/common/Utilities/EnumFlag.h +++ b/src/common/Utilities/EnumFlag.h @@ -1,6 +1,18 @@ /* - * Copyright (C) 2016+ AzerothCore , released under GNU GPL v2 license, you may redistribute it and/or modify it under version 2 of the License, or (at your option), any later version. - * Copyright (C) 2008-2021 TrinityCore + * This file is part of the AzerothCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Affero General Public License as published by the + * Free Software Foundation; either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ #ifndef EnumFlag_h__ diff --git a/src/common/Utilities/TaskScheduler.cpp b/src/common/Utilities/TaskScheduler.cpp index b1c1cbd41..1d0bf89e6 100644 --- a/src/common/Utilities/TaskScheduler.cpp +++ b/src/common/Utilities/TaskScheduler.cpp @@ -1,6 +1,18 @@ /* - * Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 - * Copyright (C) 2008+ TrinityCore + * This file is part of the AzerothCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Affero General Public License as published by the + * Free Software Foundation; either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ #include "TaskScheduler.h" diff --git a/src/common/Utilities/TaskScheduler.h b/src/common/Utilities/TaskScheduler.h index 56cdaf17f..a256be680 100644 --- a/src/common/Utilities/TaskScheduler.h +++ b/src/common/Utilities/TaskScheduler.h @@ -1,6 +1,18 @@ /* - * Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 - * Copyright (C) 2008+ TrinityCore + * This file is part of the AzerothCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Affero General Public License as published by the + * Free Software Foundation; either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ #ifndef _TASK_SCHEDULER_H_ diff --git a/src/server/game/Battlegrounds/BattlegroundScore.h b/src/server/game/Battlegrounds/BattlegroundScore.h index e07c41dd7..4ed344b7e 100644 --- a/src/server/game/Battlegrounds/BattlegroundScore.h +++ b/src/server/game/Battlegrounds/BattlegroundScore.h @@ -122,4 +122,4 @@ protected: uint32 HealingDone = 0; }; -#endif // TRINITY_BATTLEGROUND_SCORE_H +#endif // _BATTLEGROUND_SCORE_H diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index 824810fda..4cbadd49d 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -1058,7 +1058,7 @@ enum AcoreStrings LANG_COMMAND_TICKETLISTRESPONSE = 2029, LANG_COMMAND_TICKETCOMPLETED = 2030, - // Trinity strings 5000-9999 + // acore strings 5000-9999 LANG_COMMAND_FREEZE = 5000, LANG_COMMAND_FREEZE_ERROR = 5001, LANG_COMMAND_FREEZE_WRONG = 5002, diff --git a/src/server/game/Movement/Spline/MoveSpline.h b/src/server/game/Movement/Spline/MoveSpline.h index d713ba9f3..5ebe5f5aa 100644 --- a/src/server/game/Movement/Spline/MoveSpline.h +++ b/src/server/game/Movement/Spline/MoveSpline.h @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#ifndef TRINITYSERVER_MOVEPLINE_H -#define TRINITYSERVER_MOVEPLINE_H +#ifndef AC_MOVEPLINE_H +#define AC_MOVEPLINE_H #include "MoveSplineInitArgs.h" #include "Spline.h" @@ -132,4 +132,4 @@ namespace Movement } }; } -#endif // TRINITYSERVER_MOVEPLINE_H +#endif // AC_MOVEPLINE_H diff --git a/src/server/game/Movement/Spline/MoveSplineFlag.h b/src/server/game/Movement/Spline/MoveSplineFlag.h index 638a921a1..17e812815 100644 --- a/src/server/game/Movement/Spline/MoveSplineFlag.h +++ b/src/server/game/Movement/Spline/MoveSplineFlag.h @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#ifndef TRINITYSERVER_MOVESPLINEFLAG_H -#define TRINITYSERVER_MOVESPLINEFLAG_H +#ifndef AC_MOVESPLINEFLAG_H +#define AC_MOVESPLINEFLAG_H #include "MovementTypedefs.h" #include @@ -145,4 +145,4 @@ namespace Movement #endif } -#endif // TRINITYSERVER_MOVESPLINEFLAG_H +#endif // AC_MOVESPLINEFLAG_H diff --git a/src/server/game/Movement/Spline/MoveSplineInit.h b/src/server/game/Movement/Spline/MoveSplineInit.h index 5d969e9f0..a98da3446 100644 --- a/src/server/game/Movement/Spline/MoveSplineInit.h +++ b/src/server/game/Movement/Spline/MoveSplineInit.h @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#ifndef TRINITYSERVER_MOVESPLINEINIT_H -#define TRINITYSERVER_MOVESPLINEINIT_H +#ifndef AC_MOVESPLINEINIT_H +#define AC_MOVESPLINEINIT_H #include "MoveSplineInitArgs.h" #include "PathGenerator.h" @@ -209,4 +209,4 @@ namespace Movement inline void MoveSplineInit::DisableTransportPathTransformations() { args.TransformForTransport = false; } } -#endif // TRINITYSERVER_MOVESPLINEINIT_H +#endif // AC_MOVESPLINEINIT_H diff --git a/src/server/game/Movement/Spline/MoveSplineInitArgs.h b/src/server/game/Movement/Spline/MoveSplineInitArgs.h index e0789a4f1..a0d26fd54 100644 --- a/src/server/game/Movement/Spline/MoveSplineInitArgs.h +++ b/src/server/game/Movement/Spline/MoveSplineInitArgs.h @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#ifndef TRINITYSERVER_MOVESPLINEINIT_ARGS_H -#define TRINITYSERVER_MOVESPLINEINIT_ARGS_H +#ifndef AC_MOVESPLINEINIT_ARGS_H +#define AC_MOVESPLINEINIT_ARGS_H #include "MoveSplineFlag.h" #include @@ -68,4 +68,4 @@ namespace Movement }; } -#endif // TRINITYSERVER_MOVESPLINEINIT_ARGS_H +#endif // AC_MOVESPLINEINIT_ARGS_H diff --git a/src/server/game/Movement/Spline/MovementPacketBuilder.h b/src/server/game/Movement/Spline/MovementPacketBuilder.h index 6ec1af6a3..711eccc33 100644 --- a/src/server/game/Movement/Spline/MovementPacketBuilder.h +++ b/src/server/game/Movement/Spline/MovementPacketBuilder.h @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#ifndef TRINITYSERVER_PACKET_BUILDER_H -#define TRINITYSERVER_PACKET_BUILDER_H +#ifndef AC_PACKET_BUILDER_H +#define AC_PACKET_BUILDER_H #include "Define.h" @@ -40,4 +40,4 @@ namespace Movement static void WriteCreate(const MoveSpline& mov, ByteBuffer& data); }; } -#endif // TRINITYSERVER_PACKET_BUILDER_H +#endif // AC_PACKET_BUILDER_H diff --git a/src/server/game/Movement/Spline/MovementTypedefs.h b/src/server/game/Movement/Spline/MovementTypedefs.h index d0b879c05..512bcc7dc 100644 --- a/src/server/game/Movement/Spline/MovementTypedefs.h +++ b/src/server/game/Movement/Spline/MovementTypedefs.h @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#ifndef TRINITYSERVER_TYPEDEFS_H -#define TRINITYSERVER_TYPEDEFS_H +#ifndef AC_TYPEDEFS_H +#define AC_TYPEDEFS_H #include "Common.h" @@ -74,4 +74,4 @@ namespace Movement extern UInt32Counter splineIdGen; } -#endif // TRINITYSERVER_TYPEDEFS_H +#endif // AC_TYPEDEFS_H diff --git a/src/server/game/Movement/Spline/Spline.h b/src/server/game/Movement/Spline/Spline.h index 98896d931..d9d255f0a 100644 --- a/src/server/game/Movement/Spline/Spline.h +++ b/src/server/game/Movement/Spline/Spline.h @@ -15,8 +15,8 @@ * with this program. If not, see . */ -#ifndef TRINITYSERVER_SPLINE_H -#define TRINITYSERVER_SPLINE_H +#ifndef AC_SPLINE_H +#define AC_SPLINE_H #include "Errors.h" #include "MovementTypedefs.h" @@ -210,4 +210,4 @@ namespace Movement #include "SplineImpl.h" -#endif // TRINITYSERVER_SPLINE_H +#endif // AC_SPLINE_H diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 1689944cf..80862401e 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -1,7 +1,18 @@ /* - * Copyright (C) 2016+ AzerothCore , released under GNU GPL v2 license, you may redistribute it and/or modify it under version 2 of the License, or (at your option), any later version. - * Copyright (C) 2008-2016 TrinityCore - * Copyright (C) 2005-2009 MaNGOS + * This file is part of the AzerothCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Affero General Public License as published by the + * Free Software Foundation; either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . */ /* ScriptData diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/instance_the_underbog.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/instance_the_underbog.cpp index c06178bb3..557afea8d 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/instance_the_underbog.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/instance_the_underbog.cpp @@ -1,14 +1,14 @@ /* - * Copyright (C) 2008-2018 TrinityCore + * This file is part of the AzerothCore Project. See AUTHORS file for Copyright information * * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your + * under the terms of the GNU Affero General Public License as published by the + * Free Software Foundation; either version 3 of the License, or (at your * option) any later version. * * This program is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for * more details. * * You should have received a copy of the GNU General Public License along