diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-09-04 13:38:24 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-09-04 13:38:24 +0200 |
| commit | b23190393248455f04d3a06def030a1ec7efad1e (patch) | |
| tree | 1ce3772314492dcdb985641269a3114813d4b4dc /src/server/game/Entities/GameObject | |
| parent | b20acfe701e6f5f995f2776f076d3c494c02e1aa (diff) | |
Core/Misc: Port all the refactors sneaked in master to 3.3.5 include cleanup port
Diffstat (limited to 'src/server/game/Entities/GameObject')
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 3fc26262ede..97c017ca13b 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -27,6 +27,7 @@ #include "GameObjectModel.h" #include "GameObjectPackets.h" #include "GameTime.h" +#include "GossipDef.h" #include "GridNotifiersImpl.h" #include "Group.h" #include "GroupMgr.h" @@ -43,7 +44,6 @@ #include "ScriptMgr.h" #include "SpellMgr.h" #include "Transport.h" -#include "GossipDef.h" #include "World.h" #include <G3D/Quat.h> #include <sstream> @@ -97,7 +97,7 @@ WorldPacket GameObjectTemplate::BuildQueryData(LocaleConstant loc) const bool QuaternionData::isUnit() const { - return fabs(x * x + y * y + z * z + w * w - 1.0f) < 1e-5; + return fabs(x * x + y * y + z * z + w * w - 1.0f) < 1e-5f; } QuaternionData QuaternionData::fromEulerAnglesZYX(float Z, float Y, float X) @@ -1018,8 +1018,7 @@ void GameObject::SaveToDB() void GameObject::SaveToDB(uint32 mapid, std::vector<Difficulty> const& spawnDifficulties) { - const GameObjectTemplate* goI = GetGOInfo(); - + GameObjectTemplate const* goI = GetGOInfo(); if (!goI) return; @@ -1427,7 +1426,7 @@ void GameObject::SetGoArtKit(uint8 kit) void GameObject::SetGoArtKit(uint8 artkit, GameObject* go, ObjectGuid::LowType lowguid) { - const GameObjectData* data = nullptr; + GameObjectData const* data = nullptr; if (go) { go->SetGoArtKit(artkit); |