diff options
author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2020-05-31 12:17:26 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-31 14:17:26 +0200 |
commit | 8c09b6e58b0e4f33b7a8e376a28709e693cf2914 (patch) | |
tree | 2c4f1c0fea9adfe230e58a61fbc1cb0d168c3512 /src | |
parent | 0eb9b5bfe65961fb2062e71f33e3e0d8931159bb (diff) |
Cherry-pick some cmake commits (#24720)
* Build system: Support new in cmake 3.17 Ninja Multi-Config generator
(cherry picked from commit 369b618d4f160816818681ed7e41063e2d9ba5b5)
* Build system: Fixed PCH with MSVC & Ninja generator
(cherry picked from commit d669f46b6d5190dabc686a35656e8b03f5ec325b)
* Core: Fix clang 10 warnings
(cherry picked from commit 7272508cb4b51ec5591b6f0e542ea29091db7546)
# Conflicts:
# src/common/Utilities/Util.h
# src/server/bnetserver/REST/LoginRESTService.cpp
# src/server/game/Entities/Object/Position.h
# src/server/game/Entities/Player/Player.cpp
# src/server/game/Guilds/GuildFinderMgr.h
# src/server/game/Movement/Spline/MoveSplineFlag.h
# src/server/shared/Dynamic/LinkedList.h
* Build system: Set -Wno-deprecated-copy only for clang 10
(cherry picked from commit 7fdeb259ba398d5d9343a5dcd1a89562dfcbe981)
* Core/Misc: GCC build and warning fixes
(cherry picked from commit 4d69cc1c567180b408ddbadb9edf26859cf4c006)
# Conflicts:
# src/common/Utilities/Util.cpp
# src/server/database/Database/MySQLConnection.cpp
# src/server/game/Battlefield/Zones/BattlefieldTB.cpp
# src/server/game/DataStores/M2Stores.cpp
# src/server/game/DungeonFinding/LFGMgr.cpp
# src/server/game/DungeonFinding/LFGPlayerData.cpp
# src/server/game/Entities/GameObject/GameObject.cpp
# src/server/game/Entities/Item/Item.cpp
# src/server/game/Entities/Object/Updates/UpdateFields.h
# src/server/game/Entities/Player/Player.cpp
# src/server/game/Entities/Player/RestMgr.cpp
# src/server/game/Entities/Unit/Unit.cpp
# src/server/game/Handlers/PetHandler.cpp
# src/server/game/Server/Packets/GuildPackets.h
# src/server/game/Spells/Auras/SpellAuraEffects.cpp
# src/server/game/Spells/Auras/SpellAuras.cpp
# src/server/game/Spells/Spell.cpp
# src/server/game/Spells/SpellInfo.cpp
# src/server/game/Spells/SpellMgr.cpp
# src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp
# src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp
# src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
# src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
# src/server/scripts/Northrend/zone_sholazar_basin.cpp
# src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
# src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
# src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
# src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
# src/tools/vmap4_extractor/gameobject_extract.cpp
# src/tools/vmap4_extractor/model.cpp
# src/tools/vmap4_extractor/vec3d.h
* Build system: Print found git version when warning about it being too old
(cherry picked from commit 1ae72db201189877c1b863fac140eb4b0a45c5bb)
* Build system: Removed hard requirement on BOOST_ROOT being set as environment variable, it can now be also passed as command line argument to cmake and fix compile warning with boost 1.73
(cherry picked from commit 161944b7643c62f9e7705c64e42d42e5d07f1959)
# Conflicts:
# dep/boost/CMakeLists.txt
* Remove some code that was already removed from 335 and then cherry-picked into master
Co-authored-by: Shauren <shauren.trinity@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/common/Logging/LogMessage.cpp | 5 | ||||
-rw-r--r-- | src/common/Utilities/Util.cpp | 4 | ||||
-rw-r--r-- | src/common/Utilities/Util.h | 8 | ||||
-rw-r--r-- | src/server/game/DataStores/M2Stores.cpp | 8 | ||||
-rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 1 | ||||
-rw-r--r-- | src/server/game/Movement/Spline/MoveSplineFlag.h | 1 | ||||
-rw-r--r-- | src/server/scripts/Northrend/zone_sholazar_basin.cpp | 5 | ||||
-rw-r--r-- | src/server/shared/Dynamic/LinkedList.h | 6 | ||||
-rw-r--r-- | src/tools/vmap4_extractor/model.cpp | 7 | ||||
-rw-r--r-- | src/tools/vmap4_extractor/vec3d.h | 19 |
10 files changed, 14 insertions, 50 deletions
diff --git a/src/common/Logging/LogMessage.cpp b/src/common/Logging/LogMessage.cpp index f8fcdcc7eea..5f10087d1f0 100644 --- a/src/common/Logging/LogMessage.cpp +++ b/src/common/Logging/LogMessage.cpp @@ -16,6 +16,7 @@ */ #include "LogMessage.h" +#include "StringFormat.h" #include "Util.h" LogMessage::LogMessage(LogLevel _level, std::string const& _type, std::string&& _text) @@ -32,9 +33,7 @@ std::string LogMessage::getTimeStr(time_t time) { tm aTm; localtime_r(&time, &aTm); - char buf[20]; - snprintf(buf, 20, "%04d-%02d-%02d_%02d:%02d:%02d", aTm.tm_year + 1900, aTm.tm_mon + 1, aTm.tm_mday, aTm.tm_hour, aTm.tm_min, aTm.tm_sec); - return std::string(buf); + return Trinity::StringFormat("%04d-%02d-%02d_%02d:%02d:%02d", aTm.tm_year + 1900, aTm.tm_mon + 1, aTm.tm_mday, aTm.tm_hour, aTm.tm_min, aTm.tm_sec); } std::string LogMessage::getTimeStr() const diff --git a/src/common/Utilities/Util.cpp b/src/common/Utilities/Util.cpp index 30bc25e4b04..2e5c3a266fe 100644 --- a/src/common/Utilities/Util.cpp +++ b/src/common/Utilities/Util.cpp @@ -283,9 +283,7 @@ std::string TimeToTimestampStr(time_t t) // HH hour (2 digits 00-23) // MM minutes (2 digits 00-59) // SS seconds (2 digits 00-59) - char buf[20]; - snprintf(buf, 20, "%04d-%02d-%02d_%02d-%02d-%02d", aTm.tm_year+1900, aTm.tm_mon+1, aTm.tm_mday, aTm.tm_hour, aTm.tm_min, aTm.tm_sec); - return std::string(buf); + return Trinity::StringFormat("%04d-%02d-%02d_%02d-%02d-%02d", aTm.tm_year + 1900, aTm.tm_mon + 1, aTm.tm_mday, aTm.tm_hour, aTm.tm_min, aTm.tm_sec); } std::string TimeToHumanReadable(time_t t) diff --git a/src/common/Utilities/Util.h b/src/common/Utilities/Util.h index 866e01e7bf6..2178deb5505 100644 --- a/src/common/Utilities/Util.h +++ b/src/common/Utilities/Util.h @@ -407,14 +407,6 @@ public: return !(*this == right); } - inline flag96& operator=(flag96 const& right) - { - part[0] = right.part[0]; - part[1] = right.part[1]; - part[2] = right.part[2]; - return *this; - } - inline flag96 operator&(flag96 const& right) const { return flag96(part[0] & right.part[0], part[1] & right.part[1], part[2] & right.part[2]); diff --git a/src/server/game/DataStores/M2Stores.cpp b/src/server/game/DataStores/M2Stores.cpp index a30cd1ae124..d8caf1b340d 100644 --- a/src/server/game/DataStores/M2Stores.cpp +++ b/src/server/game/DataStores/M2Stores.cpp @@ -155,10 +155,8 @@ bool readCamera(M2Camera const* cam, uint32 buffSize, M2Header const* header, Ci uint32 timeDiffThis = posTimestamps[i] - lastTarget.timeStamp; float xDiff = nextTarget.locations.GetPositionX() - lastTarget.locations.GetPositionX(); float yDiff = nextTarget.locations.GetPositionY() - lastTarget.locations.GetPositionY(); - float zDiff = nextTarget.locations.GetPositionZ() - lastTarget.locations.GetPositionZ(); x = lastTarget.locations.GetPositionX() + (xDiff * (float(timeDiffThis) / float(timeDiffTarget))); y = lastTarget.locations.GetPositionY() + (yDiff * (float(timeDiffThis) / float(timeDiffTarget))); - z = lastTarget.locations.GetPositionZ() + (zDiff * (float(timeDiffThis) / float(timeDiffTarget))); } float xDiff = x - thisCam.locations.GetPositionX(); float yDiff = y - thisCam.locations.GetPositionY(); @@ -203,10 +201,10 @@ void LoadM2Cameras(std::string const& dataPath) // Get file size m2file.seekg(0, std::ios::end); - std::streamoff const fileSize = m2file.tellg(); + std::streamoff fileSize = m2file.tellg(); // Reject if not at least the size of the header - if (static_cast<uint32 const>(fileSize) < sizeof(M2Header)) + if (static_cast<uint32>(fileSize) < sizeof(M2Header)) { TC_LOG_ERROR("server.loading", "Camera file %s is damaged. File is smaller than header size", filename.string().c_str()); m2file.close(); @@ -240,7 +238,7 @@ void LoadM2Cameras(std::string const& dataPath) // Read header M2Header const* header = reinterpret_cast<M2Header const*>(buffer.data()); - if (header->ofsCameras + sizeof(M2Camera) > static_cast<uint32 const>(fileSize)) + if (header->ofsCameras + sizeof(M2Camera) > static_cast<uint32>(fileSize)) { TC_LOG_ERROR("server.loading", "Camera file %s is damaged. Camera references position beyond file end", filename.string().c_str()); continue; diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 69ab6c7a4cb..7a5fd4106c7 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -532,7 +532,6 @@ void GameObject::Update(uint32 diff) m_lootState = GO_READY; // for other GOis same switched without delay to GO_READY break; } - // NO BREAK for switch (m_lootState) } /* fallthrough */ case GO_READY: diff --git a/src/server/game/Movement/Spline/MoveSplineFlag.h b/src/server/game/Movement/Spline/MoveSplineFlag.h index 21aa1ada38b..199baf53ea3 100644 --- a/src/server/game/Movement/Spline/MoveSplineFlag.h +++ b/src/server/game/Movement/Spline/MoveSplineFlag.h @@ -73,7 +73,6 @@ namespace Movement MoveSplineFlag() { raw() = 0; } MoveSplineFlag(uint32 f) { raw() = f; } - MoveSplineFlag(MoveSplineFlag const& f) { raw() = f.raw(); } // Constant interface diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 9cf48336457..137b6de5296 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -504,9 +504,7 @@ public: Creature* crunchy = shooter->FindNearestCreature(NPC_CRUNCHY, 30); Creature* bird = shooter->FindNearestCreature(NPC_THICKBIRD, 30); - if (!bird || !crunchy) - ; // fall to EVENT_MISS - else + if (bird && crunchy) { shooter->CastSpell(bird, SPELL_MISS_BIRD_APPLE); bird->CastSpell(bird, SPELL_BIRD_FALL); @@ -517,7 +515,6 @@ public: crunchy->GetMotionMaster()->MovePoint(0, bird->GetPositionX(), bird->GetPositionY(), bird->GetMap()->GetWaterOrGroundLevel(bird->GetPhaseMask(), bird->GetPositionX(), bird->GetPositionY(), bird->GetPositionZ())); /// @todo Make crunchy perform emote eat when he reaches the bird - break; } } diff --git a/src/server/shared/Dynamic/LinkedList.h b/src/server/shared/Dynamic/LinkedList.h index 071f7ae5740..0e9e44a2da4 100644 --- a/src/server/shared/Dynamic/LinkedList.h +++ b/src/server/shared/Dynamic/LinkedList.h @@ -164,12 +164,6 @@ class LinkedListHead { // construct with node pointer _Pnode } - Iterator& operator=(Iterator const& _Right) - { - _Ptr = _Right._Ptr; - return *this; - } - Iterator& operator=(const_pointer const& _Right) { _Ptr = pointer(_Right); diff --git a/src/tools/vmap4_extractor/model.cpp b/src/tools/vmap4_extractor/model.cpp index 7dcccb8ffe7..ebb37ba2cde 100644 --- a/src/tools/vmap4_extractor/model.cpp +++ b/src/tools/vmap4_extractor/model.cpp @@ -27,9 +27,8 @@ #include <cstdio> #include <limits> -Model::Model(std::string &filename) : filename(filename), vertices(0), indices(0) +Model::Model(std::string &filename) : filename(filename), header(), vertices(nullptr), indices(nullptr) { - memset(&header, 0, sizeof(header)); } bool Model::open() @@ -142,7 +141,7 @@ Vec3D fixCoordSystem(Vec3D const& v) void Doodad::Extract(ADT::MDDF const& doodadDef, char const* ModelInstName, uint32 mapID, uint32 tileX, uint32 tileY, FILE* pDirfile) { - char tempname[512]; + char tempname[1036]; sprintf(tempname, "%s/%s", szWorkDirWmo, ModelInstName); FILE* input = fopen(tempname, "r+b"); @@ -216,7 +215,7 @@ void Doodad::ExtractSet(WMODoodadData const& doodadData, ADT::MODF const& wmo, u } } - char tempname[512]; + char tempname[1036]; sprintf(tempname, "%s/%s", szWorkDirWmo, ModelInstName); FILE* input = fopen(tempname, "r+b"); if (!input) diff --git a/src/tools/vmap4_extractor/vec3d.h b/src/tools/vmap4_extractor/vec3d.h index 9de57ed03b3..0ac1b832dde 100644 --- a/src/tools/vmap4_extractor/vec3d.h +++ b/src/tools/vmap4_extractor/vec3d.h @@ -28,15 +28,9 @@ public: Vec3D(float x0 = 0.0f, float y0 = 0.0f, float z0 = 0.0f) : x(x0), y(y0), z(z0) { } - Vec3D(Vec3D const& v) : x(v.x), y(v.y), z(v.z) { } + Vec3D(Vec3D const& v) = default; - Vec3D& operator=(Vec3D const& v) - { - x = v.x; - y = v.y; - z = v.z; - return *this; - } + Vec3D& operator=(Vec3D const& v) = default; Vec3D operator+(Vec3D const& v) const { @@ -151,14 +145,9 @@ public: Vec2D(float x0 = 0.0f, float y0 = 0.0f) : x(x0), y(y0) { } - Vec2D(Vec2D const& v) : x(v.x), y(v.y) { } + Vec2D(Vec2D const& v) = default; - Vec2D& operator=(Vec2D const& v) - { - x = v.x; - y = v.y; - return *this; - } + Vec2D& operator=(Vec2D const& v) = default; Vec2D operator+(Vec2D const& v) const { |