From ddedcac510f6fb35cae13be6f0dc50384fd77cfc Mon Sep 17 00:00:00 2001 From: David Cernat Date: Tue, 4 Apr 2017 10:16:09 +0300 Subject: [PATCH] [General] Read and write mpNums in world packets --- components/openmw-mp/Packets/World/PacketContainer.cpp | 1 + components/openmw-mp/Packets/World/PacketDoorState.cpp | 1 + components/openmw-mp/Packets/World/PacketObjectAnimPlay.cpp | 1 + components/openmw-mp/Packets/World/PacketObjectDelete.cpp | 1 + components/openmw-mp/Packets/World/PacketObjectLock.cpp | 1 + components/openmw-mp/Packets/World/PacketObjectMove.cpp | 1 + components/openmw-mp/Packets/World/PacketObjectRotate.cpp | 1 + components/openmw-mp/Packets/World/PacketObjectScale.cpp | 1 + components/openmw-mp/Packets/World/PacketObjectUnlock.cpp | 1 + components/openmw-mp/Packets/World/PacketScriptLocalFloat.cpp | 1 + components/openmw-mp/Packets/World/PacketScriptLocalShort.cpp | 1 + 11 files changed, 11 insertions(+) diff --git a/components/openmw-mp/Packets/World/PacketContainer.cpp b/components/openmw-mp/Packets/World/PacketContainer.cpp index cf61c1fb9..65729f326 100644 --- a/components/openmw-mp/Packets/World/PacketContainer.cpp +++ b/components/openmw-mp/Packets/World/PacketContainer.cpp @@ -46,6 +46,7 @@ void PacketContainer::Packet(RakNet::BitStream *bs, bool send) RW(worldObject.refId, send); RW(worldObject.refNumIndex, send); + RW(worldObject.mpNum, send); RW(worldObject.containerChanges.count, send); ContainerItem containerItem; diff --git a/components/openmw-mp/Packets/World/PacketDoorState.cpp b/components/openmw-mp/Packets/World/PacketDoorState.cpp index dc307e8d4..3d981ebcd 100644 --- a/components/openmw-mp/Packets/World/PacketDoorState.cpp +++ b/components/openmw-mp/Packets/World/PacketDoorState.cpp @@ -35,6 +35,7 @@ void PacketDoorState::Packet(RakNet::BitStream *bs, bool send) RW(worldObject.refId, send); RW(worldObject.refNumIndex, send); + RW(worldObject.mpNum, send); RW(worldObject.doorState, send); if (!send) diff --git a/components/openmw-mp/Packets/World/PacketObjectAnimPlay.cpp b/components/openmw-mp/Packets/World/PacketObjectAnimPlay.cpp index cbfda63a5..f64fb32e3 100644 --- a/components/openmw-mp/Packets/World/PacketObjectAnimPlay.cpp +++ b/components/openmw-mp/Packets/World/PacketObjectAnimPlay.cpp @@ -35,6 +35,7 @@ void PacketObjectAnimPlay::Packet(RakNet::BitStream *bs, bool send) RW(worldObject.refId, send); RW(worldObject.refNumIndex, send); + RW(worldObject.mpNum, send); RW(worldObject.animGroup, send); RW(worldObject.animMode, send); diff --git a/components/openmw-mp/Packets/World/PacketObjectDelete.cpp b/components/openmw-mp/Packets/World/PacketObjectDelete.cpp index 2d6cad146..260f707e5 100644 --- a/components/openmw-mp/Packets/World/PacketObjectDelete.cpp +++ b/components/openmw-mp/Packets/World/PacketObjectDelete.cpp @@ -35,6 +35,7 @@ void PacketObjectDelete::Packet(RakNet::BitStream *bs, bool send) RW(worldObject.refId, send); RW(worldObject.refNumIndex, send); + RW(worldObject.mpNum, send); if (!send) { diff --git a/components/openmw-mp/Packets/World/PacketObjectLock.cpp b/components/openmw-mp/Packets/World/PacketObjectLock.cpp index 96aaa114b..7a1ff5c80 100644 --- a/components/openmw-mp/Packets/World/PacketObjectLock.cpp +++ b/components/openmw-mp/Packets/World/PacketObjectLock.cpp @@ -35,6 +35,7 @@ void PacketObjectLock::Packet(RakNet::BitStream *bs, bool send) RW(worldObject.refId, send); RW(worldObject.refNumIndex, send); + RW(worldObject.mpNum, send); RW(worldObject.lockLevel, send); if (!send) diff --git a/components/openmw-mp/Packets/World/PacketObjectMove.cpp b/components/openmw-mp/Packets/World/PacketObjectMove.cpp index ac89cac1e..5be5db633 100644 --- a/components/openmw-mp/Packets/World/PacketObjectMove.cpp +++ b/components/openmw-mp/Packets/World/PacketObjectMove.cpp @@ -35,6 +35,7 @@ void PacketObjectMove::Packet(RakNet::BitStream *bs, bool send) RW(worldObject.refId, send); RW(worldObject.refNumIndex, send); + RW(worldObject.mpNum, send); RW(worldObject.pos.pos[0], send); RW(worldObject.pos.pos[1], send); RW(worldObject.pos.pos[2], send); diff --git a/components/openmw-mp/Packets/World/PacketObjectRotate.cpp b/components/openmw-mp/Packets/World/PacketObjectRotate.cpp index 4086ac29e..0eabefc3a 100644 --- a/components/openmw-mp/Packets/World/PacketObjectRotate.cpp +++ b/components/openmw-mp/Packets/World/PacketObjectRotate.cpp @@ -35,6 +35,7 @@ void PacketObjectRotate::Packet(RakNet::BitStream *bs, bool send) RW(worldObject.refId, send); RW(worldObject.refNumIndex, send); + RW(worldObject.mpNum, send); RW(worldObject.pos.rot[0], send); RW(worldObject.pos.rot[1], send); RW(worldObject.pos.rot[2], send); diff --git a/components/openmw-mp/Packets/World/PacketObjectScale.cpp b/components/openmw-mp/Packets/World/PacketObjectScale.cpp index 893df3206..bf77dd7de 100644 --- a/components/openmw-mp/Packets/World/PacketObjectScale.cpp +++ b/components/openmw-mp/Packets/World/PacketObjectScale.cpp @@ -35,6 +35,7 @@ void PacketObjectScale::Packet(RakNet::BitStream *bs, bool send) RW(worldObject.refId, send); RW(worldObject.refNumIndex, send); + RW(worldObject.mpNum, send); RW(worldObject.scale, send); if (!send) diff --git a/components/openmw-mp/Packets/World/PacketObjectUnlock.cpp b/components/openmw-mp/Packets/World/PacketObjectUnlock.cpp index cf2d123ca..2683b0340 100644 --- a/components/openmw-mp/Packets/World/PacketObjectUnlock.cpp +++ b/components/openmw-mp/Packets/World/PacketObjectUnlock.cpp @@ -35,6 +35,7 @@ void PacketObjectUnlock::Packet(RakNet::BitStream *bs, bool send) RW(worldObject.refId, send); RW(worldObject.refNumIndex, send); + RW(worldObject.mpNum, send); if (!send) { diff --git a/components/openmw-mp/Packets/World/PacketScriptLocalFloat.cpp b/components/openmw-mp/Packets/World/PacketScriptLocalFloat.cpp index e7bd0b078..c90e719f7 100644 --- a/components/openmw-mp/Packets/World/PacketScriptLocalFloat.cpp +++ b/components/openmw-mp/Packets/World/PacketScriptLocalFloat.cpp @@ -35,6 +35,7 @@ void PacketScriptLocalFloat::Packet(RakNet::BitStream *bs, bool send) RW(worldObject.refId, send); RW(worldObject.refNumIndex, send); + RW(worldObject.mpNum, send); RW(worldObject.index, send); RW(worldObject.floatVal, send); diff --git a/components/openmw-mp/Packets/World/PacketScriptLocalShort.cpp b/components/openmw-mp/Packets/World/PacketScriptLocalShort.cpp index fc063b18f..0e4c6104a 100644 --- a/components/openmw-mp/Packets/World/PacketScriptLocalShort.cpp +++ b/components/openmw-mp/Packets/World/PacketScriptLocalShort.cpp @@ -35,6 +35,7 @@ void PacketScriptLocalShort::Packet(RakNet::BitStream *bs, bool send) RW(worldObject.refId, send); RW(worldObject.refNumIndex, send); + RW(worldObject.mpNum, send); RW(worldObject.index, send); RW(worldObject.shortVal, send);