teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[General] Make packet style more consistent

Browse source
This commit is contained in:
David Cernat 2017-05-24 22:09:35 +03:00
parent 11369f6513
commit 7ec431ce3d
31 changed files with 87 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/openmw-mp/Packets/Actor/PacketActorAnimFlags.cpp
View file

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

6
components/openmw-mp/Packets/Actor/PacketActorAnimPlay.cpp
View file

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

6
components/openmw-mp/Packets/Actor/PacketActorAttack.cpp
View file

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

6
components/openmw-mp/Packets/Actor/PacketActorAuthority.cpp
View file

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

6
components/openmw-mp/Packets/Actor/PacketActorCellChange.cpp
View file

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

6
components/openmw-mp/Packets/Actor/PacketActorEquipment.cpp
View file

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

4
components/openmw-mp/Packets/Actor/PacketActorList.cpp
View file

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

6
components/openmw-mp/Packets/Actor/PacketActorPosition.cpp
View file

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

6
components/openmw-mp/Packets/Actor/PacketActorSpeech.cpp
View file

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

6
components/openmw-mp/Packets/Actor/PacketActorStatsDynamic.cpp
View file

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

6
components/openmw-mp/Packets/Actor/PacketActorTest.cpp
View file

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

6
components/openmw-mp/Packets/Player/PacketPlayerCellState.cpp
View file

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

6
components/openmw-mp/Packets/Player/PacketPlayerInventory.cpp
View file

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

6
components/openmw-mp/Packets/Player/PacketPlayerJournal.cpp
View file

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

6
components/openmw-mp/Packets/Player/PacketPlayerSpellbook.cpp
View file

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

4
components/openmw-mp/Packets/World/PacketContainer.cpp
View file

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

6
components/openmw-mp/Packets/World/PacketDoorState.cpp
View file

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

6
components/openmw-mp/Packets/World/PacketMusicPlay.cpp
View file

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

6
components/openmw-mp/Packets/World/PacketObjectAnimPlay.cpp
View file

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

6
components/openmw-mp/Packets/World/PacketObjectDelete.cpp
View file

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

6
components/openmw-mp/Packets/World/PacketObjectLock.cpp
View file

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

6
components/openmw-mp/Packets/World/PacketObjectMove.cpp
View file

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

6
components/openmw-mp/Packets/World/PacketObjectPlace.cpp
View file

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

6
components/openmw-mp/Packets/World/PacketObjectRotate.cpp
View file

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

6
components/openmw-mp/Packets/World/PacketObjectScale.cpp
View file

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

6
components/openmw-mp/Packets/World/PacketObjectTrap.cpp
View file

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

6
components/openmw-mp/Packets/World/PacketScriptGlobalShort.cpp
View file

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

6
components/openmw-mp/Packets/World/PacketScriptLocalFloat.cpp
View file

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

6
components/openmw-mp/Packets/World/PacketScriptLocalShort.cpp
View file

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

6
components/openmw-mp/Packets/World/PacketScriptMemberShort.cpp
View file

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

6
components/openmw-mp/Packets/World/PacketVideoPlay.cpp
View file

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