diff options
| -rw-r--r-- | src/server/game/Movement/MotionMaster.cpp | 2 | ||||
| -rw-r--r-- | src/tools/mmaps_generator/TerrainBuilder.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index f792aa959fb..c9ca7772186 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -428,7 +428,7 @@ void MotionMaster::MoveCharge(PathGenerator path, float speed, uint32 id) { Vector3 dest = path.GetActualEndPosition(); - MoveCharge(dest.x, dest.y, dest.z); + MoveCharge(dest.x, dest.y, dest.z, speed, id); Movement::MoveSplineInit init(_owner); init.MovebyPath(path.GetPath()); diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index 6f26a43fa05..a42cd2b9bc6 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -295,7 +295,6 @@ namespace MMAP printf("TerrainBuilder::loadMap: Failed to read some data expected 1, read 0\n"); } - // FIXME: "the address of ‘liquid_type’ will always evaluate as ‘true’" if (liquid_map) { int count = meshData.liquidVerts.size() / 3; @@ -369,7 +368,7 @@ namespace MMAP float* tverts = meshData.solidVerts.getCArray(); int* ttris = ttriangles.getCArray(); - if (ltriangles.size() + ttriangles.size() == 0) + if ((ltriangles.size() + ttriangles.size()) == 0) return false; // make a copy of liquid vertices |