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

Many, many cmangos Cata commits applied

Browse source 
The following commits were either applied or found not to be applicable:
This commit is contained in:
Charles A Edwards 2016-08-27 18:42:03 +01:00 • committed by Antz
parent 32a26f44c7
commit a800f3b1ad
100 changed files with 2385 additions and 1305 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

2
src/shared/Utilities/Util.cpp
View file

@ -65,7 +65,7 @@ uint32 WorldTimer::getMSTime_internal(bool savetime /*= false*/)
// calculate time diff between two world ticks
// special case: curr_time < old_time - we suppose that our time has not ticked at all
// this should be constant value otherwise it is possible that our time can start ticking backwards until next world tick!!!
uint64 diff = 0;
ACE_UINT64 diff = 0;
(currTime - g_SystemTickTime).msec(diff);
// lets calculate current world time

6
src/shared/revision.h
View file

@ -33,11 +33,11 @@
#define CHAR_DB_VERSION_NR 21
#define CHAR_DB_STRUCTURE_NR 2
#define CHAR_DB_CONTENT_NR 1
#define CHAR_DB_CONTENT_NR 2
#define CHAR_DB_UPDATE_DESCRIPTION "match_client_limits"
#define WORLD_DB_VERSION_NR 21
#define WORLD_DB_STRUCTURE_NR 1
#define WORLD_DB_CONTENT_NR 0
#define WORLD_DB_STRUCTURE_NR 2
#define WORLD_DB_CONTENT_NR 3
#define WORLD_DB_UPDATE_DESCRIPTION "script_binding populated"
#endif // __REVISION_H__