mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-31 13:37:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed vs2012 build

Browse source
This commit is contained in:
Antz 2016-10-12 08:33:59 +01:00 • committed by Antz
parent 95f98ca7a5
commit f7418a4323
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/game/WorldHandlers/GridDefines.h
View file

@ -84,10 +84,10 @@ template<const unsigned int LIMIT>
struct CoordPair
{
CoordPair(uint32 x = 0, uint32 y = 0) : x_coord(x), y_coord(y) {}
CoordPair(const CoordPair<LIMIT> &obj) : x_coord(obj.x_coord), y_coord(obj.y_coord) {}
bool operator==(const CoordPair<LIMIT> &obj) const { return (obj.x_coord == x_coord && obj.y_coord == y_coord); }
bool operator!=(const CoordPair<LIMIT> &obj) const { return !operator==(obj); }
CoordPair<LIMIT>& operator=(const CoordPair<LIMIT> &obj)
CoordPair(const CoordPair<LIMIT>& obj) : x_coord(obj.x_coord), y_coord(obj.y_coord) {}
bool operator==(const CoordPair<LIMIT>& obj) const { return (obj.x_coord == x_coord && obj.y_coord == y_coord); }
bool operator!=(const CoordPair<LIMIT>& obj) const { return !operator==(obj); }
CoordPair<LIMIT>& operator=(const CoordPair<LIMIT>& obj)
{
x_coord = obj.x_coord;
y_coord = obj.y_coord;
@ -97,33 +97,33 @@ struct CoordPair
void operator<<(const uint32 val)
{
if (x_coord > val)
x_coord -= val;
{ x_coord -= val; }
else
x_coord = 0;
{ x_coord = 0; }
}
void operator>>(const uint32 val)
{
if (x_coord + val < LIMIT)
x_coord += val;
{ x_coord += val; }
else
x_coord = LIMIT - 1;
{ x_coord = LIMIT - 1; }
}
void operator-=(const uint32 val)
{
if (y_coord > val)
y_coord -= val;
{ y_coord -= val; }
else
y_coord = 0;
{ y_coord = 0; }
}
void operator+=(const uint32 val)
{
if (y_coord + val < LIMIT)
y_coord += val;
{ y_coord += val; }
else
y_coord = LIMIT - 1;
{ y_coord = LIMIT - 1; }
}
CoordPair& normalize()
@ -167,14 +167,14 @@ namespace MaNGOS
inline void NormalizeMapCoord(float& c)
{
if (c > MAP_HALFSIZE - 0.5)
c = MAP_HALFSIZE - 0.5;
{ c = MAP_HALFSIZE - 0.5; }
else if (c < -(MAP_HALFSIZE - 0.5))
c = -(MAP_HALFSIZE - 0.5);
{ c = -(MAP_HALFSIZE - 0.5); }
}
inline bool IsValidMapCoord(float c)
{
return std::isfinite(c) && (std::fabs(c) <= MAP_HALFSIZE - 0.5);
return finite(c) && (std::fabs(c) <= MAP_HALFSIZE - 0.5);
}
inline bool IsValidMapCoord(float x, float y)
@ -184,12 +184,12 @@ namespace MaNGOS
inline bool IsValidMapCoord(float x, float y, float z)
{
return IsValidMapCoord(x, y) && std::isfinite(z);
return IsValidMapCoord(x, y) && finite(z);
}
inline bool IsValidMapCoord(float x, float y, float z, float o)
{
return IsValidMapCoord(x, y, z) && std::isfinite(o);
return IsValidMapCoord(x, y, z) && finite(o);
}
}
#endif

4
src/shared/Common/Common.h
View file

@ -72,7 +72,7 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <cmath>
#include <math.h>
#include <errno.h>
#include <signal.h>
#include <assert.h>
@ -173,7 +173,7 @@ typedef off_t ACE_OFF_T;
* @param f
* @return float
*/
inline float finiteAlways(float f) { return std::isfinite(f) ? f : 0.0f; }
inline float finiteAlways(float f) { return finite(f) ? f : 0.0f; }
#define atol(a) strtoul( a, NULL, 10)