Forgotten change to seat flag defines, thanks to Venugh.
This commit is contained in:
@@ -1939,7 +1939,7 @@ struct VehicleSeatEntry
|
|||||||
// 46-57 added in 3.1, floats mostly
|
// 46-57 added in 3.1, floats mostly
|
||||||
|
|
||||||
bool CanEnterOrExit() const { return m_flags & VEHICLE_SEAT_FLAG_CAN_ENTER_OR_EXIT; }
|
bool CanEnterOrExit() const { return m_flags & VEHICLE_SEAT_FLAG_CAN_ENTER_OR_EXIT; }
|
||||||
bool CanSwitchFromSeat() const { return m_flags & VEHICLE_SEAT_FLAG_B_CANSWITCH; }
|
bool CanSwitchFromSeat() const { return m_flags & VEHICLE_SEAT_FLAG_CAN_SWITCH; }
|
||||||
bool IsUsableByOverride() const { return (m_flags & VEHICLE_SEAT_FLAG_UNCONTROLLED)
|
bool IsUsableByOverride() const { return (m_flags & VEHICLE_SEAT_FLAG_UNCONTROLLED)
|
||||||
|| (m_flagsB & (VEHICLE_SEAT_FLAG_B_USABLE_FORCED | VEHICLE_SEAT_FLAG_B_USABLE_FORCED_2 | VEHICLE_SEAT_FLAG_B_USABLE_FORCED_3)); }
|
|| (m_flagsB & (VEHICLE_SEAT_FLAG_B_USABLE_FORCED | VEHICLE_SEAT_FLAG_B_USABLE_FORCED_2 | VEHICLE_SEAT_FLAG_B_USABLE_FORCED_3)); }
|
||||||
bool IsEjectable() const { return m_flagsB & VEHICLE_SEAT_FLAG_B_EJECTABLE; }
|
bool IsEjectable() const { return m_flagsB & VEHICLE_SEAT_FLAG_B_EJECTABLE; }
|
||||||
|
|||||||
@@ -341,7 +341,7 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (seat->second.SeatInfo->m_flags && !(seat->second.SeatInfo->m_flags & VEHICLE_SEAT_FLAG_UNK11))
|
if (seat->second.SeatInfo->m_flags && !(seat->second.SeatInfo->m_flags & VEHICLE_SEAT_FLAG_UNK1))
|
||||||
unit->AddUnitState(UNIT_STAT_ONVEHICLE);
|
unit->AddUnitState(UNIT_STAT_ONVEHICLE);
|
||||||
|
|
||||||
unit->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT);
|
unit->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT);
|
||||||
|
|||||||
Reference in New Issue
Block a user