From 7ec431ce3d908490636c21cdb5cf5ddeac450aaa Mon Sep 17 00:00:00 2001 From: David Cernat Date: Wed, 24 May 2017 22:09:35 +0300 Subject: [PATCH] [General] Make packet style more consistent --- components/openmw-mp/Packets/Actor/PacketActorAnimFlags.cpp | 6 +++--- components/openmw-mp/Packets/Actor/PacketActorAnimPlay.cpp | 6 +++--- components/openmw-mp/Packets/Actor/PacketActorAttack.cpp | 6 +++--- components/openmw-mp/Packets/Actor/PacketActorAuthority.cpp | 6 +++--- .../openmw-mp/Packets/Actor/PacketActorCellChange.cpp | 6 +++--- components/openmw-mp/Packets/Actor/PacketActorEquipment.cpp | 6 +++--- components/openmw-mp/Packets/Actor/PacketActorList.cpp | 4 ---- components/openmw-mp/Packets/Actor/PacketActorPosition.cpp | 6 +++--- components/openmw-mp/Packets/Actor/PacketActorSpeech.cpp | 6 +++--- .../openmw-mp/Packets/Actor/PacketActorStatsDynamic.cpp | 6 +++--- components/openmw-mp/Packets/Actor/PacketActorTest.cpp | 6 +++--- .../openmw-mp/Packets/Player/PacketPlayerCellState.cpp | 6 +++--- .../openmw-mp/Packets/Player/PacketPlayerInventory.cpp | 6 +++--- components/openmw-mp/Packets/Player/PacketPlayerJournal.cpp | 6 +++--- .../openmw-mp/Packets/Player/PacketPlayerSpellbook.cpp | 6 +++--- components/openmw-mp/Packets/World/PacketContainer.cpp | 4 ---- components/openmw-mp/Packets/World/PacketDoorState.cpp | 6 +++--- components/openmw-mp/Packets/World/PacketMusicPlay.cpp | 6 +++--- components/openmw-mp/Packets/World/PacketObjectAnimPlay.cpp | 6 +++--- components/openmw-mp/Packets/World/PacketObjectDelete.cpp | 6 +++--- components/openmw-mp/Packets/World/PacketObjectLock.cpp | 6 +++--- components/openmw-mp/Packets/World/PacketObjectMove.cpp | 6 +++--- components/openmw-mp/Packets/World/PacketObjectPlace.cpp | 6 +++--- components/openmw-mp/Packets/World/PacketObjectRotate.cpp | 6 +++--- components/openmw-mp/Packets/World/PacketObjectScale.cpp | 6 +++--- components/openmw-mp/Packets/World/PacketObjectTrap.cpp | 6 +++--- .../openmw-mp/Packets/World/PacketScriptGlobalShort.cpp | 6 +++--- .../openmw-mp/Packets/World/PacketScriptLocalFloat.cpp | 6 +++--- .../openmw-mp/Packets/World/PacketScriptLocalShort.cpp | 6 +++--- .../openmw-mp/Packets/World/PacketScriptMemberShort.cpp | 6 +++--- components/openmw-mp/Packets/World/PacketVideoPlay.cpp | 6 +++--- 31 files changed, 87 insertions(+), 95 deletions(-) diff --git a/components/openmw-mp/Packets/Actor/PacketActorAnimFlags.cpp b/components/openmw-mp/Packets/Actor/PacketActorAnimFlags.cpp index 9b8bdba8e..ba21f8078 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorAnimFlags.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorAnimFlags.cpp @@ -13,10 +13,10 @@ void PacketActorAnimFlags::Packet(RakNet::BitStream *bs, bool send) { ActorPacket::Packet(bs, send); - if (!send) - actorList->baseActors.clear(); - else + if (send) actorList->count = (unsigned int)(actorList->baseActors.size()); + else + actorList->baseActors.clear(); RW(actorList->count, send); diff --git a/components/openmw-mp/Packets/Actor/PacketActorAnimPlay.cpp b/components/openmw-mp/Packets/Actor/PacketActorAnimPlay.cpp index 79bac8ba8..81e03404e 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorAnimPlay.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorAnimPlay.cpp @@ -13,10 +13,10 @@ void PacketActorAnimPlay::Packet(RakNet::BitStream *bs, bool send) { ActorPacket::Packet(bs, send); - if (!send) - actorList->baseActors.clear(); - else + if (send) actorList->count = (unsigned int)(actorList->baseActors.size()); + else + actorList->baseActors.clear(); RW(actorList->count, send); diff --git a/components/openmw-mp/Packets/Actor/PacketActorAttack.cpp b/components/openmw-mp/Packets/Actor/PacketActorAttack.cpp index 41c28ea8b..1c2a62fc5 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorAttack.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorAttack.cpp @@ -13,10 +13,10 @@ void PacketActorAttack::Packet(RakNet::BitStream *bs, bool send) { ActorPacket::Packet(bs, send); - if (!send) - actorList->baseActors.clear(); - else + if (send) actorList->count = (unsigned int)(actorList->baseActors.size()); + else + actorList->baseActors.clear(); RW(actorList->count, send); diff --git a/components/openmw-mp/Packets/Actor/PacketActorAuthority.cpp b/components/openmw-mp/Packets/Actor/PacketActorAuthority.cpp index 3ee58a330..17c2f10e7 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorAuthority.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorAuthority.cpp @@ -12,10 +12,10 @@ void PacketActorAuthority::Packet(RakNet::BitStream *bs, bool send) { ActorPacket::Packet(bs, send); - if (!send) - actorList->baseActors.clear(); - else + if (send) actorList->count = (unsigned int)(actorList->baseActors.size()); + else + actorList->baseActors.clear(); RW(actorList->count, send); diff --git a/components/openmw-mp/Packets/Actor/PacketActorCellChange.cpp b/components/openmw-mp/Packets/Actor/PacketActorCellChange.cpp index d6d3c1a15..a862f040a 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorCellChange.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorCellChange.cpp @@ -13,10 +13,10 @@ void PacketActorCellChange::Packet(RakNet::BitStream *bs, bool send) { ActorPacket::Packet(bs, send); - if (!send) - actorList->baseActors.clear(); - else + if (send) actorList->count = (unsigned int)(actorList->baseActors.size()); + else + actorList->baseActors.clear(); RW(actorList->count, send); diff --git a/components/openmw-mp/Packets/Actor/PacketActorEquipment.cpp b/components/openmw-mp/Packets/Actor/PacketActorEquipment.cpp index f4999a8c4..b75e4ebfd 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorEquipment.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorEquipment.cpp @@ -13,10 +13,10 @@ void PacketActorEquipment::Packet(RakNet::BitStream *bs, bool send) { ActorPacket::Packet(bs, send); - if (!send) - actorList->baseActors.clear(); - else + if (send) actorList->count = (unsigned int)(actorList->baseActors.size()); + else + actorList->baseActors.clear(); RW(actorList->count, send); diff --git a/components/openmw-mp/Packets/Actor/PacketActorList.cpp b/components/openmw-mp/Packets/Actor/PacketActorList.cpp index a233aa29a..53f022bef 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorList.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorList.cpp @@ -15,13 +15,9 @@ void PacketActorList::Packet(RakNet::BitStream *bs, bool send) RW(actorList->action, send); if (send) - { actorList->count = (unsigned int)(actorList->baseActors.size()); - } else - { actorList->baseActors.clear(); - } RW(actorList->count, send); diff --git a/components/openmw-mp/Packets/Actor/PacketActorPosition.cpp b/components/openmw-mp/Packets/Actor/PacketActorPosition.cpp index c4342b13f..990e7fe49 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorPosition.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorPosition.cpp @@ -13,10 +13,10 @@ void PacketActorPosition::Packet(RakNet::BitStream *bs, bool send) { ActorPacket::Packet(bs, send); - if (!send) - actorList->baseActors.clear(); - else + if (send) actorList->count = (unsigned int)(actorList->baseActors.size()); + else + actorList->baseActors.clear(); RW(actorList->count, send); diff --git a/components/openmw-mp/Packets/Actor/PacketActorSpeech.cpp b/components/openmw-mp/Packets/Actor/PacketActorSpeech.cpp index e7f5de559..4cfa68ed0 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorSpeech.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorSpeech.cpp @@ -13,10 +13,10 @@ void PacketActorSpeech::Packet(RakNet::BitStream *bs, bool send) { ActorPacket::Packet(bs, send); - if (!send) - actorList->baseActors.clear(); - else + if (send) actorList->count = (unsigned int)(actorList->baseActors.size()); + else + actorList->baseActors.clear(); RW(actorList->count, send); diff --git a/components/openmw-mp/Packets/Actor/PacketActorStatsDynamic.cpp b/components/openmw-mp/Packets/Actor/PacketActorStatsDynamic.cpp index 5d4c89584..8bcd97b4e 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorStatsDynamic.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorStatsDynamic.cpp @@ -14,10 +14,10 @@ void PacketActorStatsDynamic::Packet(RakNet::BitStream *bs, bool send) { ActorPacket::Packet(bs, send); - if (!send) - actorList->baseActors.clear(); - else + if (send) actorList->count = (unsigned int)(actorList->baseActors.size()); + else + actorList->baseActors.clear(); RW(actorList->count, send); diff --git a/components/openmw-mp/Packets/Actor/PacketActorTest.cpp b/components/openmw-mp/Packets/Actor/PacketActorTest.cpp index 54c718be5..8d07763b2 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorTest.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorTest.cpp @@ -13,10 +13,10 @@ void PacketActorTest::Packet(RakNet::BitStream *bs, bool send) { ActorPacket::Packet(bs, send); - if (!send) - actorList->baseActors.clear(); - else + if (send) actorList->count = (unsigned int)(actorList->baseActors.size()); + else + actorList->baseActors.clear(); RW(actorList->count, send); diff --git a/components/openmw-mp/Packets/Player/PacketPlayerCellState.cpp b/components/openmw-mp/Packets/Player/PacketPlayerCellState.cpp index 30050121a..4a480a8b3 100644 --- a/components/openmw-mp/Packets/Player/PacketPlayerCellState.cpp +++ b/components/openmw-mp/Packets/Player/PacketPlayerCellState.cpp @@ -13,10 +13,10 @@ void mwmp::PacketPlayerCellState::Packet(RakNet::BitStream *bs, bool send) { PlayerPacket::Packet(bs, send); - if (!send) - player->cellStateChanges.cellStates.clear(); - else + if (send) player->cellStateChanges.count = (unsigned int)(player->cellStateChanges.cellStates.size()); + else + player->cellStateChanges.cellStates.clear(); RW(player->cellStateChanges.count, send); diff --git a/components/openmw-mp/Packets/Player/PacketPlayerInventory.cpp b/components/openmw-mp/Packets/Player/PacketPlayerInventory.cpp index 8562c894f..808d81431 100644 --- a/components/openmw-mp/Packets/Player/PacketPlayerInventory.cpp +++ b/components/openmw-mp/Packets/Player/PacketPlayerInventory.cpp @@ -19,10 +19,10 @@ void PacketPlayerInventory::Packet(RakNet::BitStream *bs, bool send) RW(player->inventoryChanges.action, send); - if (!send) - player->inventoryChanges.items.clear(); - else + if (send) player->inventoryChanges.count = (unsigned int) (player->inventoryChanges.items.size()); + else + player->inventoryChanges.items.clear(); RW(player->inventoryChanges.count, send); diff --git a/components/openmw-mp/Packets/Player/PacketPlayerJournal.cpp b/components/openmw-mp/Packets/Player/PacketPlayerJournal.cpp index 7dd82f686..c1dce47a8 100644 --- a/components/openmw-mp/Packets/Player/PacketPlayerJournal.cpp +++ b/components/openmw-mp/Packets/Player/PacketPlayerJournal.cpp @@ -13,10 +13,10 @@ void PacketPlayerJournal::Packet(RakNet::BitStream *bs, bool send) { PlayerPacket::Packet(bs, send); - if (!send) - player->journalChanges.journalItems.clear(); - else + if (send) player->journalChanges.count = (unsigned int)(player->journalChanges.journalItems.size()); + else + player->journalChanges.journalItems.clear(); RW(player->journalChanges.count, send); diff --git a/components/openmw-mp/Packets/Player/PacketPlayerSpellbook.cpp b/components/openmw-mp/Packets/Player/PacketPlayerSpellbook.cpp index b6c535b49..00f9d64ca 100644 --- a/components/openmw-mp/Packets/Player/PacketPlayerSpellbook.cpp +++ b/components/openmw-mp/Packets/Player/PacketPlayerSpellbook.cpp @@ -15,10 +15,10 @@ void PacketPlayerSpellbook::Packet(RakNet::BitStream *bs, bool send) RW(player->spellbookChanges.action, send); - if (!send) - player->spellbookChanges.spells.clear(); - else + if (send) player->spellbookChanges.count = (unsigned int) (player->spellbookChanges.spells.size()); + else + player->spellbookChanges.spells.clear(); RW(player->spellbookChanges.count, send); diff --git a/components/openmw-mp/Packets/World/PacketContainer.cpp b/components/openmw-mp/Packets/World/PacketContainer.cpp index 4b1f67739..f6e495c9c 100644 --- a/components/openmw-mp/Packets/World/PacketContainer.cpp +++ b/components/openmw-mp/Packets/World/PacketContainer.cpp @@ -16,13 +16,9 @@ void PacketContainer::Packet(RakNet::BitStream *bs, bool send) RW(event->action, send); if (send) - { event->worldObjectCount = (unsigned int)(event->worldObjects.size()); - } else - { event->worldObjects.clear(); - } RW(event->worldObjectCount, send); diff --git a/components/openmw-mp/Packets/World/PacketDoorState.cpp b/components/openmw-mp/Packets/World/PacketDoorState.cpp index f513e8de5..c96bcc8c5 100644 --- a/components/openmw-mp/Packets/World/PacketDoorState.cpp +++ b/components/openmw-mp/Packets/World/PacketDoorState.cpp @@ -12,10 +12,10 @@ void PacketDoorState::Packet(RakNet::BitStream *bs, bool send) { WorldPacket::Packet(bs, send); - if (!send) - event->worldObjects.clear(); - else + if (send) event->worldObjectCount = (unsigned int)(event->worldObjects.size()); + else + event->worldObjects.clear(); RW(event->worldObjectCount, send); diff --git a/components/openmw-mp/Packets/World/PacketMusicPlay.cpp b/components/openmw-mp/Packets/World/PacketMusicPlay.cpp index c69531995..ba09db4dc 100644 --- a/components/openmw-mp/Packets/World/PacketMusicPlay.cpp +++ b/components/openmw-mp/Packets/World/PacketMusicPlay.cpp @@ -12,10 +12,10 @@ void PacketMusicPlay::Packet(RakNet::BitStream *bs, bool send) { WorldPacket::Packet(bs, send); - if (!send) - event->worldObjects.clear(); - else + if (send) event->worldObjectCount = (unsigned int)(event->worldObjects.size()); + else + event->worldObjects.clear(); RW(event->worldObjectCount, send); diff --git a/components/openmw-mp/Packets/World/PacketObjectAnimPlay.cpp b/components/openmw-mp/Packets/World/PacketObjectAnimPlay.cpp index fd828ecb8..e91121498 100644 --- a/components/openmw-mp/Packets/World/PacketObjectAnimPlay.cpp +++ b/components/openmw-mp/Packets/World/PacketObjectAnimPlay.cpp @@ -12,10 +12,10 @@ void PacketObjectAnimPlay::Packet(RakNet::BitStream *bs, bool send) { WorldPacket::Packet(bs, send); - if (!send) - event->worldObjects.clear(); - else + if (send) event->worldObjectCount = (unsigned int)(event->worldObjects.size()); + else + event->worldObjects.clear(); RW(event->worldObjectCount, send); diff --git a/components/openmw-mp/Packets/World/PacketObjectDelete.cpp b/components/openmw-mp/Packets/World/PacketObjectDelete.cpp index c333b63ac..79c393c5e 100644 --- a/components/openmw-mp/Packets/World/PacketObjectDelete.cpp +++ b/components/openmw-mp/Packets/World/PacketObjectDelete.cpp @@ -12,10 +12,10 @@ void PacketObjectDelete::Packet(RakNet::BitStream *bs, bool send) { WorldPacket::Packet(bs, send); - if (!send) - event->worldObjects.clear(); - else + if (send) event->worldObjectCount = (unsigned int)(event->worldObjects.size()); + else + event->worldObjects.clear(); RW(event->worldObjectCount, send); diff --git a/components/openmw-mp/Packets/World/PacketObjectLock.cpp b/components/openmw-mp/Packets/World/PacketObjectLock.cpp index 6f27ee63b..200ab372f 100644 --- a/components/openmw-mp/Packets/World/PacketObjectLock.cpp +++ b/components/openmw-mp/Packets/World/PacketObjectLock.cpp @@ -12,10 +12,10 @@ void PacketObjectLock::Packet(RakNet::BitStream *bs, bool send) { WorldPacket::Packet(bs, send); - if (!send) - event->worldObjects.clear(); - else + if (send) event->worldObjectCount = (unsigned int)(event->worldObjects.size()); + else + event->worldObjects.clear(); RW(event->worldObjectCount, send); diff --git a/components/openmw-mp/Packets/World/PacketObjectMove.cpp b/components/openmw-mp/Packets/World/PacketObjectMove.cpp index 8d1015629..cd97d942d 100644 --- a/components/openmw-mp/Packets/World/PacketObjectMove.cpp +++ b/components/openmw-mp/Packets/World/PacketObjectMove.cpp @@ -12,10 +12,10 @@ void PacketObjectMove::Packet(RakNet::BitStream *bs, bool send) { WorldPacket::Packet(bs, send); - if (!send) - event->worldObjects.clear(); - else + if (send) event->worldObjectCount = (unsigned int)(event->worldObjects.size()); + else + event->worldObjects.clear(); RW(event->worldObjectCount, send); diff --git a/components/openmw-mp/Packets/World/PacketObjectPlace.cpp b/components/openmw-mp/Packets/World/PacketObjectPlace.cpp index 1270ab87c..5a6eb0e1b 100644 --- a/components/openmw-mp/Packets/World/PacketObjectPlace.cpp +++ b/components/openmw-mp/Packets/World/PacketObjectPlace.cpp @@ -12,10 +12,10 @@ void PacketObjectPlace::Packet(RakNet::BitStream *bs, bool send) { WorldPacket::Packet(bs, send); - if (!send) - event->worldObjects.clear(); - else + if (send) event->worldObjectCount = (unsigned int)(event->worldObjects.size()); + else + event->worldObjects.clear(); RW(event->worldObjectCount, send); diff --git a/components/openmw-mp/Packets/World/PacketObjectRotate.cpp b/components/openmw-mp/Packets/World/PacketObjectRotate.cpp index 9d14f42e9..8a9361d46 100644 --- a/components/openmw-mp/Packets/World/PacketObjectRotate.cpp +++ b/components/openmw-mp/Packets/World/PacketObjectRotate.cpp @@ -12,10 +12,10 @@ void PacketObjectRotate::Packet(RakNet::BitStream *bs, bool send) { WorldPacket::Packet(bs, send); - if (!send) - event->worldObjects.clear(); - else + if (send) event->worldObjectCount = (unsigned int)(event->worldObjects.size()); + else + event->worldObjects.clear(); RW(event->worldObjectCount, send); diff --git a/components/openmw-mp/Packets/World/PacketObjectScale.cpp b/components/openmw-mp/Packets/World/PacketObjectScale.cpp index 0ba4d9461..375f8181e 100644 --- a/components/openmw-mp/Packets/World/PacketObjectScale.cpp +++ b/components/openmw-mp/Packets/World/PacketObjectScale.cpp @@ -12,10 +12,10 @@ void PacketObjectScale::Packet(RakNet::BitStream *bs, bool send) { WorldPacket::Packet(bs, send); - if (!send) - event->worldObjects.clear(); - else + if (send) event->worldObjectCount = (unsigned int)(event->worldObjects.size()); + else + event->worldObjects.clear(); RW(event->worldObjectCount, send); diff --git a/components/openmw-mp/Packets/World/PacketObjectTrap.cpp b/components/openmw-mp/Packets/World/PacketObjectTrap.cpp index c209d0198..cde4bbdc2 100644 --- a/components/openmw-mp/Packets/World/PacketObjectTrap.cpp +++ b/components/openmw-mp/Packets/World/PacketObjectTrap.cpp @@ -12,10 +12,10 @@ void PacketObjectTrap::Packet(RakNet::BitStream *bs, bool send) { WorldPacket::Packet(bs, send); - if (!send) - event->worldObjects.clear(); - else + if (send) event->worldObjectCount = (unsigned int)(event->worldObjects.size()); + else + event->worldObjects.clear(); RW(event->worldObjectCount, send); diff --git a/components/openmw-mp/Packets/World/PacketScriptGlobalShort.cpp b/components/openmw-mp/Packets/World/PacketScriptGlobalShort.cpp index 764dfc0a0..07504f2b2 100644 --- a/components/openmw-mp/Packets/World/PacketScriptGlobalShort.cpp +++ b/components/openmw-mp/Packets/World/PacketScriptGlobalShort.cpp @@ -12,10 +12,10 @@ void PacketScriptGlobalShort::Packet(RakNet::BitStream *bs, bool send) { WorldPacket::Packet(bs, send); - if (!send) - event->worldObjects.clear(); - else + if (send) event->worldObjectCount = (unsigned int)(event->worldObjects.size()); + else + event->worldObjects.clear(); RW(event->worldObjectCount, send); diff --git a/components/openmw-mp/Packets/World/PacketScriptLocalFloat.cpp b/components/openmw-mp/Packets/World/PacketScriptLocalFloat.cpp index b0001b328..abfc04ef7 100644 --- a/components/openmw-mp/Packets/World/PacketScriptLocalFloat.cpp +++ b/components/openmw-mp/Packets/World/PacketScriptLocalFloat.cpp @@ -12,10 +12,10 @@ void PacketScriptLocalFloat::Packet(RakNet::BitStream *bs, bool send) { WorldPacket::Packet(bs, send); - if (!send) - event->worldObjects.clear(); - else + if (send) event->worldObjectCount = (unsigned int)(event->worldObjects.size()); + else + event->worldObjects.clear(); RW(event->worldObjectCount, send); diff --git a/components/openmw-mp/Packets/World/PacketScriptLocalShort.cpp b/components/openmw-mp/Packets/World/PacketScriptLocalShort.cpp index a3b18e494..9b0e9d54b 100644 --- a/components/openmw-mp/Packets/World/PacketScriptLocalShort.cpp +++ b/components/openmw-mp/Packets/World/PacketScriptLocalShort.cpp @@ -12,10 +12,10 @@ void PacketScriptLocalShort::Packet(RakNet::BitStream *bs, bool send) { WorldPacket::Packet(bs, send); - if (!send) - event->worldObjects.clear(); - else + if (send) event->worldObjectCount = (unsigned int)(event->worldObjects.size()); + else + event->worldObjects.clear(); RW(event->worldObjectCount, send); diff --git a/components/openmw-mp/Packets/World/PacketScriptMemberShort.cpp b/components/openmw-mp/Packets/World/PacketScriptMemberShort.cpp index 54116ded5..6cb5d28fa 100644 --- a/components/openmw-mp/Packets/World/PacketScriptMemberShort.cpp +++ b/components/openmw-mp/Packets/World/PacketScriptMemberShort.cpp @@ -12,10 +12,10 @@ void PacketScriptMemberShort::Packet(RakNet::BitStream *bs, bool send) { WorldPacket::Packet(bs, send); - if (!send) - event->worldObjects.clear(); - else + if (send) event->worldObjectCount = (unsigned int)(event->worldObjects.size()); + else + event->worldObjects.clear(); RW(event->worldObjectCount, send); diff --git a/components/openmw-mp/Packets/World/PacketVideoPlay.cpp b/components/openmw-mp/Packets/World/PacketVideoPlay.cpp index 3458ddc6d..0ce7aa4ad 100644 --- a/components/openmw-mp/Packets/World/PacketVideoPlay.cpp +++ b/components/openmw-mp/Packets/World/PacketVideoPlay.cpp @@ -12,10 +12,10 @@ void PacketVideoPlay::Packet(RakNet::BitStream *bs, bool send) { WorldPacket::Packet(bs, send); - if (!send) - event->worldObjects.clear(); - else + if (send) event->worldObjectCount = (unsigned int)(event->worldObjects.size()); + else + event->worldObjects.clear(); RW(event->worldObjectCount, send);