josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parse CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE opcode in proper way

Browse Source 
--HG--
branch : trunk
This commit is contained in:
silver1ce
2010-01-15 19:23:59 +02:00
parent b8ea34958c
commit 0451e45e06
2 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/MovementHandler.cpp
+28 -22
View File
@@ -585,32 +585,38 @@ void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recv_data)
if(!GetPlayer()->GetVehicle())
return;
if(recv_data.GetOpcode() == CMSG_REQUEST_VEHICLE_PREV_SEAT)
switch (recv_data.GetOpcode())
{
case CMSG_REQUEST_VEHICLE_PREV_SEAT:
GetPlayer()->ChangeSeat(-1, false);
return;
}
else if(recv_data.GetOpcode() == CMSG_REQUEST_VEHICLE_NEXT_SEAT)
{
break;
case CMSG_REQUEST_VEHICLE_NEXT_SEAT:
GetPlayer()->ChangeSeat(-1, true);
return;
break;
case CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE:
{
uint64 guid; // current vehicle guid
if(!recv_data.readPackGUID(guid))
return;
ReadMovementInfo(recv_data, &GetPlayer()->GetVehicleBase()->m_movementInfo);
uint64 accessory; // accessory guid
if(!recv_data.readPackGUID(accessory))
return;
int8 seatId;
recv_data >> 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))
GetPlayer()->EnterVehicle(vehicle, seatId);
}
break;
}
else if(recv_data.GetOpcode() == CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE)
ReadMovementInfo(recv_data, &GetPlayer()->GetVehicleBase()->m_movementInfo);
uint64 guid;
if(!recv_data.readPackGUID(guid))
return;
int8 seatId;
recv_data >> seatId;
if(!guid)
GetPlayer()->ChangeSeat(-1, seatId > 0); // prev/next
else if(Unit *vehUnit = ObjectAccessor::GetUnit(*GetPlayer(), guid))
if(Vehicle *vehicle = vehUnit->GetVehicleKit())
if(vehicle->HasEmptySeat(seatId))
GetPlayer()->EnterVehicle(vehicle, seatId);
}
void WorldSession::HandleRequestVehicleExit(WorldPacket &recv_data)
src/game/Unit.cpp
+1 -10
View File
@@ -3252,18 +3252,9 @@ void Unit::_UpdateSpells( uint32 time )
++i;
}
WorldPacket auras;
for (VisibleAuraMap::iterator itr = m_visibleAuras.begin(); itr != m_visibleAuras.end(); ++itr)
if (itr->second->IsNeedClientUpdate())
itr->second->ConstructAuraInfo(auras);
if(auras.wpos())
{
WorldPacket data(SMSG_AURA_UPDATE, GetPackGUID().size() + auras.wpos());
data.append(GetPackGUID());
data.append(auras);
SendMessageToSet(&data, true);
}
itr->second->ClientUpdate();
_DeleteRemovedAuras();