Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
This commit is contained in:
Vincent-Michael committed 2013-06-30 00:36:03 +02:00
commit 676c7341d6
61 files changed
+3376 -1643

No files matched your search

@@ -75,11 +75,29 @@ enum VehicleSpells
VEHICLE_SPELL_PARACHUTE = 45472
};
struct PassengerInfo
{
uint64 Guid;
bool IsUnselectable;
void Reset()
{
Guid = 0;
IsUnselectable = false;
}
};
struct VehicleSeat
{
explicit VehicleSeat(VehicleSeatEntry const* seatInfo) : SeatInfo(seatInfo), Passenger(0) {}
explicit VehicleSeat(VehicleSeatEntry const* seatInfo) : SeatInfo(seatInfo)
{
Passenger.Reset();
}
bool IsEmpty() const { return !Passenger.Guid; }
VehicleSeatEntry const* SeatInfo;
uint64 Passenger;
PassengerInfo Passenger;
};
struct VehicleAccessory