Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: sql/updates/world/2012_09_09_02_world_spell_script_names.sql src/server/game/Achievements/AchievementMgr.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Entities/Vehicle/Vehicle.cpp
This commit is contained in:
commit
d6743c7c95
15 files changed
+144
-27
No files matched your search
@@ -97,4 +97,14 @@ typedef std::vector<VehicleAccessory> VehicleAccessoryList;
|
||||
typedef std::map<uint32, VehicleAccessoryList> VehicleAccessoryContainer;
|
||||
typedef std::map<int8, VehicleSeat> SeatMap;
|
||||
|
||||
class TransportBase
|
||||
{
|
||||
public:
|
||||
/// This method transforms supplied transport offsets into global coordinates
|
||||
virtual void CalculatePassengerPosition(float& x, float& y, float& z, float& o) = 0;
|
||||
|
||||
/// This method transforms supplied global coordinates into local offsets
|
||||
virtual void CalculatePassengerOffset(float& x, float& y, float& z, float& o) = 0;
|
||||
};
|
||||
|
||||
#endif
|
||||
Reference in new issue
Block a user