[General] Make packet style more consistent

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)
+    if (send)
-        actorList->baseActors.clear();
-    else
         actorList->count = (unsigned int)(actorList->baseActors.size());
+    else
+        actorList->baseActors.clear();
 
     RW(actorList->count, send);
 

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)
+    if (send)
-        actorList->baseActors.clear();
-    else
         actorList->count = (unsigned int)(actorList->baseActors.size());
+    else
+        actorList->baseActors.clear();
 
     RW(actorList->count, send);
 

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)
+    if (send)
-        actorList->baseActors.clear();
-    else
         actorList->count = (unsigned int)(actorList->baseActors.size());
+    else
+        actorList->baseActors.clear();
 
     RW(actorList->count, send);
 

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)
+    if (send)
-        actorList->baseActors.clear();
-    else
         actorList->count = (unsigned int)(actorList->baseActors.size());
+    else
+        actorList->baseActors.clear();
 
     RW(actorList->count, send);
 

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)
+    if (send)
-        actorList->baseActors.clear();
-    else
         actorList->count = (unsigned int)(actorList->baseActors.size());
+    else
+        actorList->baseActors.clear();
 
     RW(actorList->count, send);
 

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)
+    if (send)
-        actorList->baseActors.clear();
-    else
         actorList->count = (unsigned int)(actorList->baseActors.size());
+    else
+        actorList->baseActors.clear();
 
     RW(actorList->count, send);
 

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);
 

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)
+    if (send)
-        actorList->baseActors.clear();
-    else
         actorList->count = (unsigned int)(actorList->baseActors.size());
+    else
+        actorList->baseActors.clear();
 
     RW(actorList->count, send);
 

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)
+    if (send)
-        actorList->baseActors.clear();
-    else
         actorList->count = (unsigned int)(actorList->baseActors.size());
+    else
+        actorList->baseActors.clear();
 
     RW(actorList->count, send);
 

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)
+    if (send)
-        actorList->baseActors.clear();
-    else
         actorList->count = (unsigned int)(actorList->baseActors.size());
+    else
+        actorList->baseActors.clear();
 
     RW(actorList->count, send);
 

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)
+    if (send)
-        actorList->baseActors.clear();
-    else
         actorList->count = (unsigned int)(actorList->baseActors.size());
+    else
+        actorList->baseActors.clear();
 
     RW(actorList->count, send);
 

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)
+    if (send)
-        player->cellStateChanges.cellStates.clear();
-    else
         player->cellStateChanges.count = (unsigned int)(player->cellStateChanges.cellStates.size());
+    else
+        player->cellStateChanges.cellStates.clear();
 
     RW(player->cellStateChanges.count, send);
 

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)
+    if (send)
-        player->inventoryChanges.items.clear();
-    else
         player->inventoryChanges.count = (unsigned int) (player->inventoryChanges.items.size());
+    else
+        player->inventoryChanges.items.clear();
 
     RW(player->inventoryChanges.count, send);
 

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)
+    if (send)
-        player->journalChanges.journalItems.clear();
-    else
         player->journalChanges.count = (unsigned int)(player->journalChanges.journalItems.size());
+    else
+        player->journalChanges.journalItems.clear();
 
     RW(player->journalChanges.count, send);
 

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)
+    if (send)
-        player->spellbookChanges.spells.clear();
-    else
         player->spellbookChanges.count = (unsigned int) (player->spellbookChanges.spells.size());
+    else
+        player->spellbookChanges.spells.clear();
 
     RW(player->spellbookChanges.count, send);
 

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);
 

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)
+    if (send)
-        event->worldObjects.clear();
-    else
         event->worldObjectCount = (unsigned int)(event->worldObjects.size());
+    else
+        event->worldObjects.clear();
 
     RW(event->worldObjectCount, send);
 

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)
+    if (send)
-        event->worldObjects.clear();
-    else
         event->worldObjectCount = (unsigned int)(event->worldObjects.size());
+    else
+        event->worldObjects.clear();
 
     RW(event->worldObjectCount, send);
 

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)
+    if (send)
-        event->worldObjects.clear();
-    else
         event->worldObjectCount = (unsigned int)(event->worldObjects.size());
+    else
+        event->worldObjects.clear();
 
     RW(event->worldObjectCount, send);
 

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)
+    if (send)
-        event->worldObjects.clear();
-    else
         event->worldObjectCount = (unsigned int)(event->worldObjects.size());
+    else
+        event->worldObjects.clear();
 
     RW(event->worldObjectCount, send);
 

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)
+    if (send)
-        event->worldObjects.clear();
-    else
         event->worldObjectCount = (unsigned int)(event->worldObjects.size());
+    else
+        event->worldObjects.clear();
 
     RW(event->worldObjectCount, send);
 

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)
+    if (send)
-        event->worldObjects.clear();
-    else
         event->worldObjectCount = (unsigned int)(event->worldObjects.size());
+    else
+        event->worldObjects.clear();
 
     RW(event->worldObjectCount, send);
 

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)
+    if (send)
-        event->worldObjects.clear();
-    else
         event->worldObjectCount = (unsigned int)(event->worldObjects.size());
+    else
+        event->worldObjects.clear();
 
     RW(event->worldObjectCount, send);
 

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)
+    if (send)
-        event->worldObjects.clear();
-    else
         event->worldObjectCount = (unsigned int)(event->worldObjects.size());
+    else
+        event->worldObjects.clear();
 
     RW(event->worldObjectCount, send);
 

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)
+    if (send)
-        event->worldObjects.clear();
-    else
         event->worldObjectCount = (unsigned int)(event->worldObjects.size());
+    else
+        event->worldObjects.clear();
 
     RW(event->worldObjectCount, send);
 

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)
+    if (send)
-        event->worldObjects.clear();
-    else
         event->worldObjectCount = (unsigned int)(event->worldObjects.size());
+    else
+        event->worldObjects.clear();
 
     RW(event->worldObjectCount, send);
 

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)
+    if (send)
-        event->worldObjects.clear();
-    else
         event->worldObjectCount = (unsigned int)(event->worldObjects.size());
+    else
+        event->worldObjects.clear();
 
     RW(event->worldObjectCount, send);
 

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)
+    if (send)
-        event->worldObjects.clear();
-    else
         event->worldObjectCount = (unsigned int)(event->worldObjects.size());
+    else
+        event->worldObjects.clear();
 
     RW(event->worldObjectCount, send);
 

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)
+    if (send)
-        event->worldObjects.clear();
-    else
         event->worldObjectCount = (unsigned int)(event->worldObjects.size());
+    else
+        event->worldObjects.clear();
 
     RW(event->worldObjectCount, send);
 

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)
+    if (send)
-        event->worldObjects.clear();
-    else
         event->worldObjectCount = (unsigned int)(event->worldObjects.size());
+    else
+        event->worldObjects.clear();
 
     RW(event->worldObjectCount, send);
 

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)
+    if (send)
-        event->worldObjects.clear();
-    else
         event->worldObjectCount = (unsigned int)(event->worldObjects.size());
+    else
+        event->worldObjects.clear();
 
     RW(event->worldObjectCount, send);