From b4652a38d366ee82fe5839163ddd4e29d9fef86e Mon Sep 17 00:00:00 2001 From: jackpoz Date: Fri, 31 May 2019 21:45:37 +0200 Subject: Core/Misc: Headers cleanup Use simple std::string concatenation instead of stringstream to avoid including header. (cherry picked from commit 9c790e231ef00c29a33b037ac2ae28d526474539) --- src/server/game/Movement/MovementGenerator.cpp | 1 + .../Movement/MovementGenerators/FlightPathMovementGenerator.cpp | 1 + src/server/game/Movement/MovementGenerators/PathMovementBase.h | 7 ++----- .../game/Movement/MovementGenerators/WaypointMovementGenerator.cpp | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/server/game/Movement/MovementGenerator.cpp b/src/server/game/Movement/MovementGenerator.cpp index 6c8cd01b475..7cbda1da955 100644 --- a/src/server/game/Movement/MovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerator.cpp @@ -22,6 +22,7 @@ #include "PathGenerator.h" #include "RandomMovementGenerator.h" #include "WaypointMovementGenerator.h" +#include MovementGenerator::~MovementGenerator() { } diff --git a/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp index 0db994b672e..f75bce43c61 100644 --- a/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.cpp @@ -24,6 +24,7 @@ #include "MoveSplineInit.h" #include "ObjectMgr.h" #include "Player.h" +#include #define FLIGHT_TRAVEL_UPDATE 100 #define TIMEDIFF_NEXT_WP 250 diff --git a/src/server/game/Movement/MovementGenerators/PathMovementBase.h b/src/server/game/Movement/MovementGenerators/PathMovementBase.h index 903b9cae50a..fb3d2eddccf 100644 --- a/src/server/game/Movement/MovementGenerators/PathMovementBase.h +++ b/src/server/game/Movement/MovementGenerators/PathMovementBase.h @@ -19,7 +19,7 @@ #define PathMovementBase_h__ #include "Define.h" -#include +#include template class PathMovementBase @@ -32,10 +32,7 @@ class PathMovementBase virtual std::string GetDebugInfo() const { - std::stringstream sstr; - sstr << std::boolalpha - << "Current Node: " << GetCurrentNode(); - return sstr.str(); + return "Current Node: " + std::to_string(GetCurrentNode()); }; protected: diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp index fa5f27b7dba..6421de3eb02 100644 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp @@ -27,6 +27,7 @@ #include "ObjectMgr.h" #include "Transport.h" #include "WaypointManager.h" +#include WaypointMovementGenerator::WaypointMovementGenerator(uint32 pathId, bool repeating) : _nextMoveTime(0), _pathId(pathId), _repeating(repeating), _loadedFromDB(true) { -- cgit v1.2.3