Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core: Fix compile warnings

Browse Source
This commit is contained in:
Nay
2013-01-22 19:34:04 +00:00
parent 7a76de93f8
commit 6fc17c6b1e
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Miscellaneous/SharedDefines.h
View File

@@ -3534,7 +3534,7 @@ enum PartyResult
ERR_PARTY_LFG_TELEPORT_IN_COMBAT = 30
};
#define MMAP_MAGIC 0x4d4d4150 // 'MMAP'
const uint32 MMAP_MAGIC = 0x4d4d4150; // 'MMAP'
#define MMAP_VERSION 3
struct MmapTileHeader

2
src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
View File

@@ -27,7 +27,7 @@ class PointMovementGenerator : public MovementGeneratorMedium< T, PointMovementG
{
public:
PointMovementGenerator(uint32 _id, float _x, float _y, float _z, bool _generatePath, float _speed = 0.0f) : id(_id),
i_x(_x), i_y(_y), i_z(_z), m_generatePath(_generatePath), speed(_speed), i_recalculateSpeed(false) {}
i_x(_x), i_y(_y), i_z(_z), speed(_speed), m_generatePath(_generatePath), i_recalculateSpeed(false) {}
void DoInitialize(T*);
void DoFinalize(T*);

6
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
View File

@@ -39,8 +39,8 @@ class TargetedMovementGeneratorMedium : public MovementGeneratorMedium< T, D >,
{
protected:
TargetedMovementGeneratorMedium(Unit* target, float offset, float angle) :
TargetedMovementGeneratorBase(target), i_recheckDistance(0), i_path(NULL),
i_offset(offset), i_angle(angle),
TargetedMovementGeneratorBase(target), i_path(NULL),
i_recheckDistance(0), i_offset(offset), i_angle(angle),
i_recalculateTravel(false), i_targetReached(false)
{
}
@@ -55,12 +55,12 @@ class TargetedMovementGeneratorMedium : public MovementGeneratorMedium< T, D >,
protected:
void _setTargetLocation(T* owner, bool updateDestination);
PathGenerator* i_path;
TimeTrackerSmall i_recheckDistance;
float i_offset;
float i_angle;
bool i_recalculateTravel : 1;
bool i_targetReached : 1;
PathGenerator* i_path;
};
template<class T>

2
src/server/game/Movement/PathGenerator.cpp
View File

@@ -30,7 +30,7 @@
PathGenerator::PathGenerator(const Unit* owner) :
_polyLength(0), _type(PATHFIND_BLANK),
_useStraightPath(false), _forceDestination(false), _pointPathLimit(MAX_POINT_PATH_LENGTH),
_sourceUnit(owner), _navMesh(NULL), _navMeshQuery(NULL), _endPosition(Vector3::zero())
_endPosition(Vector3::zero()), _sourceUnit(owner), _navMesh(NULL), _navMeshQuery(NULL)
{
sLog->outDebug(LOG_FILTER_MAPS, "++ PathGenerator::PathGenerator for %u \n", _sourceUnit->GetGUIDLow());

4
src/server/scripts/Commands/cs_mmaps.cpp
View File

@@ -98,7 +98,7 @@ public:
PointsArray pointPath = path.GetPath();
handler->PSendSysMessage("%s's path to %s:", target->GetName().c_str(), player->GetName().c_str());
handler->PSendSysMessage("Building: %s", useStraightPath ? "StraightPath" : "SmoothPath");
handler->PSendSysMessage("Result: %s - Length: %i - Type: %u", (result ? "true" : "false"), pointPath.size(), path.GetPathType());
handler->PSendSysMessage("Result: %s - Length: "SIZEFMTD" - Type: %u", (result ? "true" : "false"), pointPath.size(), path.GetPathType());
Vector3 start = path.GetStartPosition();
Vector3 end = path.GetEndPosition();
@@ -264,7 +264,7 @@ public:
if (!creatureList.empty())
{
handler->PSendSysMessage("Found %i Creatures.", creatureList.size());
handler->PSendSysMessage("Found "SIZEFTMD" Creatures.", creatureList.size());
uint32 paths = 0;
uint32 uStartTime = getMSTime();

4
src/tools/mmaps_generator/TerrainBuilder.cpp
View File

@@ -296,7 +296,7 @@ namespace MMAP
}
// FIXME: "the address of ‘liquid_type’ will always evaluate as ‘true’"
if (liquid_type && liquid_map)
if (liquid_map)
{
int count = meshData.liquidVerts.size() / 3;
float xoffset = (float(tileX)-32)*GRID_SIZE;
@@ -393,7 +393,7 @@ namespace MMAP
// FIXME: "warning: the address of ‘liquid_type’ will always evaluate as ‘true’"
// if there is no liquid, don't use liquid
if (!liquid_type || !meshData.liquidVerts.size() || !ltriangles.size())
if (!meshData.liquidVerts.size() || !ltriangles.size())
useLiquid = false;
else
{