yolinlin/azerothcore-wotlk-pbot
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2025-11-29 17:38:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:azerothcore/azerothcore-wotlk

Browse Source
This commit is contained in:
Yehonal
2016-08-17 10:15:37 +02:00
parent d28a81198d 5fe8821567
commit 422f60460e
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/acore/cmake/compiler/clang/settings.cmake
View File

@@ -15,6 +15,6 @@ if(WITH_COREDEBUG)
endif() endif()
# -Wno-narrowing needed to suppress a warning in g3d # -Wno-narrowing needed to suppress a warning in g3d
# -Wno-deprecated-register is needed to suppress 185 gsoap warnings on Unix systems. # -Wno-deprecated-register -Wstring-plus-int -Wpointer-bool-conversion are needed to suppress gsoap warnings on Unix systems.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register -Wstring-plus-int -Wpointer-bool-conversion -Wparentheses")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG=1") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG=1")

7
modules/acore/deps/mysqllite/include/my_global.h
View File

@@ -786,9 +786,12 @@ inline unsigned long long my_double2ulonglong(double d)
#define SIZE_T_MAX (~((size_t) 0)) #define SIZE_T_MAX (~((size_t) 0))
#endif #endif
#ifndef isfinite #ifdef HAVE_FINITE
#define isfinite(x) finite(x)
#else
#define finite(x) (1.0 / fabs(x) > 0.0)
#endif /* HAVE_FINITE */
#define isfinite(x) (1.0 / fabs(x) > 0.0) #define isfinite(x) (1.0 / fabs(x) > 0.0)
#endif /* isfinite */
#ifndef HAVE_ISNAN #ifndef HAVE_ISNAN
#define isnan(x) ((x) != (x)) #define isnan(x) ((x) != (x))

2
src/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
View File

@@ -138,7 +138,7 @@ void RandomMovementGenerator<Creature>::_setRandomLocation(Creature* creature)
// Xinef: tree climbing, cut as much as we can // Xinef: tree climbing, cut as much as we can
if (zDiff > 2.0f || if (zDiff > 2.0f ||
(G3D::fuzzyNe(zDiff, 0.0f) && distDiff / zDiff < 2.15f)) // ~25<EFBFBD> (G3D::fuzzyNe(zDiff, 0.0f) && distDiff / zDiff < 2.15f)) // ~25˚
{ {
_validPointsVector[_currentPoint].erase(randomIter); _validPointsVector[_currentPoint].erase(randomIter);
_preComputedPaths.erase(pathIdx); _preComputedPaths.erase(pathIdx);

4
src/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
View File

@@ -374,14 +374,14 @@ bool FlightPathMovementGenerator::DoUpdate(Player* player, uint32 /*diff*/)
{ {
if (i_currentNode >= i_path.size()) if (i_currentNode >= i_path.size())
{ {
sLog->outMisc("TAXI NODE WAS GREATER THAN PATH SIZE, GUID: %u, POINTID: %u, NODESIZE: %u, CURRENT: %u", player->GetGUIDLow(), pointId, i_path.size(), i_currentNode); sLog->outMisc("TAXI NODE WAS GREATER THAN PATH SIZE, GUID: %u, POINTID: %u, NODESIZE: %lu, CURRENT: %u", player->GetGUIDLow(), pointId, i_path.size(), i_currentNode);
player->CleanupAfterTaxiFlight(); player->CleanupAfterTaxiFlight();
return false; return false;
} }
if (i_path[i_currentNode]->mapid != player->GetMapId()) if (i_path[i_currentNode]->mapid != player->GetMapId())
{ {
sLog->outMisc("Player on different map, curmap: %u, pointmap: %u, nodesize: %u, currentnode: %u", player->GetMapId(), i_path[i_currentNode]->mapid, i_path.size(), i_currentNode); sLog->outMisc("Player on different map, curmap: %u, pointmap: %u, nodesize: %lu, currentnode: %u", player->GetMapId(), i_path[i_currentNode]->mapid, i_path.size(), i_currentNode);
player->CleanupAfterTaxiFlight(); player->CleanupAfterTaxiFlight();
return false; return false;
} }