aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common/Logging/LogMessage.cpp5
-rw-r--r--src/common/Utilities/Util.cpp4
-rw-r--r--src/common/Utilities/Util.h8
-rw-r--r--src/server/game/DataStores/M2Stores.cpp8
-rw-r--r--src/server/game/Entities/GameObject/GameObject.cpp1
-rw-r--r--src/server/game/Movement/Spline/MoveSplineFlag.h1
-rw-r--r--src/server/scripts/Northrend/zone_sholazar_basin.cpp5
-rw-r--r--src/server/shared/Dynamic/LinkedList.h6
-rw-r--r--src/tools/vmap4_extractor/model.cpp7
-rw-r--r--src/tools/vmap4_extractor/vec3d.h19
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
{