summaryrefslogtreecommitdiffstats
path: root/source/Protocol/Protocol14x.cpp
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-09-05 17:44:22 +0200
committermadmaxoft <github@xoft.cz>2013-09-05 17:44:22 +0200
commitcdaa48377846c688b4c003c35e02529ba00c779c (patch)
treedfb4d74621fc06768d4712dba4a297e6cc0e1b78 /source/Protocol/Protocol14x.cpp
parentRemoved TimedWait from cEvent. (diff)
parentFixed inconsistent meta naming (diff)
downloadcuberite-cdaa48377846c688b4c003c35e02529ba00c779c.tar
cuberite-cdaa48377846c688b4c003c35e02529ba00c779c.tar.gz
cuberite-cdaa48377846c688b4c003c35e02529ba00c779c.tar.bz2
cuberite-cdaa48377846c688b4c003c35e02529ba00c779c.tar.lz
cuberite-cdaa48377846c688b4c003c35e02529ba00c779c.tar.xz
cuberite-cdaa48377846c688b4c003c35e02529ba00c779c.tar.zst
cuberite-cdaa48377846c688b4c003c35e02529ba00c779c.zip
Diffstat (limited to 'source/Protocol/Protocol14x.cpp')
-rw-r--r--source/Protocol/Protocol14x.cpp25
1 files changed, 14 insertions, 11 deletions
diff --git a/source/Protocol/Protocol14x.cpp b/source/Protocol/Protocol14x.cpp
index 881a55717..ba9d7c01a 100644
--- a/source/Protocol/Protocol14x.cpp
+++ b/source/Protocol/Protocol14x.cpp
@@ -229,21 +229,24 @@ void cProtocol146::SendSpawnObject(const cEntity & a_Entity, char a_ObjectType,
-void cProtocol146::SendSpawnVehicle(const cEntity & a_Vehicle, char a_VehicleType)
+void cProtocol146::SendSpawnVehicle(const cEntity & a_Vehicle, char a_VehicleType, char a_VehicleSubType)
{
cCSLock Lock(m_CSPacket);
- WriteByte(PACKET_SPAWN_OBJECT);
- WriteInt (a_Vehicle.GetUniqueID());
- WriteByte(a_VehicleType);
- WriteInt ((int)(a_Vehicle.GetPosX() * 32));
- WriteInt ((int)(a_Vehicle.GetPosY() * 32));
- WriteInt ((int)(a_Vehicle.GetPosZ() * 32));
+ WriteByte (PACKET_SPAWN_OBJECT);
+ WriteInt (a_Vehicle.GetUniqueID());
+ WriteByte (a_VehicleType);
+ WriteInt ((int)(a_Vehicle.GetPosX() * 32));
+ WriteInt ((int)(a_Vehicle.GetPosY() * 32));
+ WriteInt ((int)(a_Vehicle.GetPosZ() * 32));
WriteByte ((Byte)((a_Vehicle.GetPitch() / 360.f) * 256));
WriteByte ((Byte)((a_Vehicle.GetRotation() / 360.f) * 256));
- WriteInt (1);
- WriteShort((short)(a_Vehicle.GetSpeedX() * 400));
- WriteShort((short)(a_Vehicle.GetSpeedY() * 400));
- WriteShort((short)(a_Vehicle.GetSpeedZ() * 400));
+ WriteInt (a_VehicleSubType);
+ if (a_VehicleSubType != 0)
+ {
+ WriteShort((short)(a_Vehicle.GetSpeedX() * 400));
+ WriteShort((short)(a_Vehicle.GetSpeedY() * 400));
+ WriteShort((short)(a_Vehicle.GetSpeedZ() * 400));
+ }
Flush();
}