diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2014-10-27 22:52:19 +0000 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-10-27 22:52:19 +0000 |
| commit | 5bc823f5e7fb2ac4a79748aefef8d1c2aeb72983 (patch) | |
| tree | 676321a594429c36dcd5fb3a268f29a06ca6b06e /src/server/game/Movement | |
| parent | 7dc4b7e6f81b20bb37ef7cb5f65efec1a533be79 (diff) | |
Core: Even more warning fixes
Diffstat (limited to 'src/server/game/Movement')
| -rw-r--r-- | src/server/game/Movement/MotionMaster.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Movement/MovementStructures.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index e7c35590aa7..131a6e381e0 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -441,7 +441,7 @@ void MotionMaster::MoveSeekAssistance(float x, float y, float z) { if (_owner->GetTypeId() == TYPEID_PLAYER) { - TC_LOG_ERROR("misc", "Player (GUID: %u) attempt to seek assistance", _owner->GetGUID().ToString().c_str()); + TC_LOG_ERROR("misc", "Player (GUID: %s) attempt to seek assistance", _owner->GetGUID().ToString().c_str()); } else { diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp index 9d9347a27d5..ed42c513a2c 100755 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp @@ -42,7 +42,7 @@ void WaypointMovementGenerator<Creature>::LoadPath(Creature* creature) if (!i_path) { // No path id found for entry - TC_LOG_ERROR("sql.sql", "WaypointMovementGenerator::LoadPath: creature %s (%s DB GUID: %u) doesn't have waypoint path id: %u", creature->GetName().c_str(), creature->GetGUID().ToString().c_str(), creature->GetDBTableGUIDLow(), path_id); + TC_LOG_ERROR("sql.sql", "WaypointMovementGenerator::LoadPath: creature %s (%s DB GUID: " UI64FMTD ") doesn't have waypoint path id: %u", creature->GetName().c_str(), creature->GetGUID().ToString().c_str(), creature->GetDBTableGUIDLow(), path_id); return; } diff --git a/src/server/game/Movement/MovementStructures.cpp b/src/server/game/Movement/MovementStructures.cpp index 93e940f0e64..20011a443d7 100644 --- a/src/server/game/Movement/MovementStructures.cpp +++ b/src/server/game/Movement/MovementStructures.cpp @@ -5213,7 +5213,7 @@ void Movement::PacketSender::Send() const if (Player* player = _unit->ToPlayer()) { isPlayerMovement = player->m_mover->GetTypeId() == TYPEID_PLAYER; - if (isPlayerMovement && _selfOpcode != NULL_OPCODE) + if (isPlayerMovement && _selfOpcode != static_cast<OpcodeServer>(NULL_OPCODE)) { WorldPacket data(_selfOpcode); _unit->WriteMovementInfo(data, _extraElements); @@ -5221,7 +5221,7 @@ void Movement::PacketSender::Send() const } } - if (_broadcast != NULL_OPCODE) + if (_broadcast != static_cast<OpcodeServer>(NULL_OPCODE)) { ///! Need to reset current extra element index before writing another packet if (_extraElements) |