diff options
Diffstat (limited to 'src/server/game/Handlers/VehicleHandler.cpp')
-rw-r--r-- | src/server/game/Handlers/VehicleHandler.cpp | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/src/server/game/Handlers/VehicleHandler.cpp b/src/server/game/Handlers/VehicleHandler.cpp index cf4167296e..faa2ae69df 100644 --- a/src/server/game/Handlers/VehicleHandler.cpp +++ b/src/server/game/Handlers/VehicleHandler.cpp @@ -12,7 +12,7 @@ #include "Log.h" #include "ObjectAccessor.h" -void WorldSession::HandleDismissControlledVehicle(WorldPacket &recvData) +void WorldSession::HandleDismissControlledVehicle(WorldPacket& recvData) { #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_DISMISS_CONTROLLED_VEHICLE"); @@ -47,7 +47,7 @@ void WorldSession::HandleDismissControlledVehicle(WorldPacket &recvData) _player->ExitVehicle(); } -void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recvData) +void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket& recvData) { #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recvd CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE"); @@ -65,7 +65,7 @@ void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recvData) { recvData.rfinish(); // prevent warnings spam sLog->outError("HandleChangeSeatsOnControlledVehicle, Opcode: %u, Player %u tried to switch seats but current seatflags %u don't permit that.", - recvData.GetOpcode(), GetPlayer()->GetGUIDLow(), seat->m_flags); + recvData.GetOpcode(), GetPlayer()->GetGUIDLow(), seat->m_flags); return; } @@ -78,60 +78,60 @@ void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recvData) GetPlayer()->ChangeSeat(-1, true); break; case CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE: - { - uint64 guid; // current vehicle guid - recvData.readPackGUID(guid); - - // pussywizard: - if (vehicle_base->GetGUID() != guid) { - recvData.rfinish(); // prevent warnings spam - return; + uint64 guid; // current vehicle guid + recvData.readPackGUID(guid); + + // pussywizard: + if (vehicle_base->GetGUID() != guid) + { + recvData.rfinish(); // prevent warnings spam + return; + } + + MovementInfo movementInfo; + movementInfo.guid = guid; + ReadMovementInfo(recvData, &movementInfo); + vehicle_base->m_movementInfo = movementInfo; + + uint64 accessory; // accessory guid + recvData.readPackGUID(accessory); + + int8 seatId; + recvData >> seatId; + + if (!accessory) + GetPlayer()->ChangeSeat(-1, seatId > 0); // prev/next + else if (Unit* vehUnit = ObjectAccessor::GetUnit(*GetPlayer(), accessory)) + { + if (Vehicle* vehicle = vehUnit->GetVehicleKit()) + if (vehicle->HasEmptySeat(seatId)) + vehUnit->HandleSpellClick(GetPlayer(), seatId); + } + break; } - - MovementInfo movementInfo; - movementInfo.guid = guid; - ReadMovementInfo(recvData, &movementInfo); - vehicle_base->m_movementInfo = movementInfo; - - uint64 accessory; // accessory guid - recvData.readPackGUID(accessory); - - int8 seatId; - recvData >> seatId; - - if (!accessory) - GetPlayer()->ChangeSeat(-1, seatId > 0); // prev/next - else if (Unit* vehUnit = ObjectAccessor::GetUnit(*GetPlayer(), accessory)) + case CMSG_REQUEST_VEHICLE_SWITCH_SEAT: { - if (Vehicle* vehicle = vehUnit->GetVehicleKit()) - if (vehicle->HasEmptySeat(seatId)) - vehUnit->HandleSpellClick(GetPlayer(), seatId); + uint64 guid; // current vehicle guid + recvData.readPackGUID(guid); + + int8 seatId; + recvData >> seatId; + + if (vehicle_base->GetGUID() == guid) + GetPlayer()->ChangeSeat(seatId); + else if (Unit* vehUnit = ObjectAccessor::GetUnit(*GetPlayer(), guid)) + if (Vehicle* vehicle = vehUnit->GetVehicleKit()) + if (vehicle->HasEmptySeat(seatId)) + vehUnit->HandleSpellClick(GetPlayer(), seatId); + break; } - break; - } - case CMSG_REQUEST_VEHICLE_SWITCH_SEAT: - { - uint64 guid; // current vehicle guid - recvData.readPackGUID(guid); - - int8 seatId; - recvData >> seatId; - - if (vehicle_base->GetGUID() == guid) - GetPlayer()->ChangeSeat(seatId); - else if (Unit* vehUnit = ObjectAccessor::GetUnit(*GetPlayer(), guid)) - if (Vehicle* vehicle = vehUnit->GetVehicleKit()) - if (vehicle->HasEmptySeat(seatId)) - vehUnit->HandleSpellClick(GetPlayer(), seatId); - break; - } default: break; } } -void WorldSession::HandleEnterPlayerVehicle(WorldPacket &data) +void WorldSession::HandleEnterPlayerVehicle(WorldPacket& data) { // Read guid uint64 guid; @@ -153,7 +153,7 @@ void WorldSession::HandleEnterPlayerVehicle(WorldPacket &data) } } -void WorldSession::HandleEjectPassenger(WorldPacket &data) +void WorldSession::HandleEjectPassenger(WorldPacket& data) { Vehicle* vehicle = _player->GetVehicleKit(); if (!vehicle) @@ -215,7 +215,7 @@ void WorldSession::HandleEjectPassenger(WorldPacket &data) sLog->outError("Player %u attempted to eject creature GUID %u from non-ejectable seat.", GetPlayer()->GetGUIDLow(), GUID_LOPART(guid)); } else - sLog->outError("HandleEjectPassenger: Player %u tried to eject invalid GUID " UI64FMTD , GetPlayer()->GetGUIDLow(), guid); + sLog->outError("HandleEjectPassenger: Player %u tried to eject invalid GUID " UI64FMTD, GetPlayer()->GetGUIDLow(), guid); } void WorldSession::HandleRequestVehicleExit(WorldPacket& /*recvData*/) @@ -232,7 +232,7 @@ void WorldSession::HandleRequestVehicleExit(WorldPacket& /*recvData*/) GetPlayer()->ExitVehicle(); else sLog->outError("Player %u tried to exit vehicle, but seatflags %u (ID: %u) don't permit that.", - GetPlayer()->GetGUIDLow(), seat->m_ID, seat->m_flags); + GetPlayer()->GetGUIDLow(), seat->m_ID, seat->m_flags); } } } |