mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2026-01-06 01:33:06 +00:00
Code Issues Releases Wiki Activity

[General] Fix declarations hiding class members, part 2

Browse source
This commit is contained in:
David Cernat 2019-12-04 10:17:33 +02:00
parent 270867a397
commit 154a9ce5a6
134 changed files with 223 additions and 223 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwmp/LocalPlayer.cpp
View file

@ -1642,7 +1642,7 @@ void LocalPlayer::sendSelectedSpell(const std::string& newSelectedSpellId)
getNetworking()->getPlayerPacket(ID_PLAYER_MISCELLANEOUS)->Send();
}
void LocalPlayer::sendItemUse(const MWWorld::Ptr& itemPtr, bool itemMagicState, char drawState)
void LocalPlayer::sendItemUse(const MWWorld::Ptr& itemPtr, bool itemMagicState, char currentDrawState)
{
usedItem.refId = itemPtr.getCellRef().getRefId();
usedItem.count = itemPtr.getRefData().getCount();
@ -1651,7 +1651,7 @@ void LocalPlayer::sendItemUse(const MWWorld::Ptr& itemPtr, bool itemMagicState,
usedItem.soul = itemPtr.getCellRef().getSoul();
usingItemMagic = itemMagicState;
itemUseDrawState = drawState;
itemUseDrawState = currentDrawState;
getNetworking()->getPlayerPacket(ID_PLAYER_ITEM_USE)->setPlayer(this);
getNetworking()->getPlayerPacket(ID_PLAYER_ITEM_USE)->Send();

2
apps/openmw/mwmp/LocalPlayer.hpp
View file

@ -95,7 +95,7 @@ namespace mwmp
void sendWerewolfState(bool isWerewolf);
void sendMarkLocation(const ESM::Cell& newMarkCell, const ESM::Position& newMarkPosition);
void sendSelectedSpell(const std::string& newSelectedSpellId);
void sendItemUse(const MWWorld::Ptr& itemPtr, bool usingItemMagic = false, char itemUseDrawState = 0);
void sendItemUse(const MWWorld::Ptr& itemPtr, bool usingItemMagic = false, char currentDrawState = 0);
void sendCellStates();
void clearCellStates();

4
components/openmw-mp/Master/MasterData.hpp
View file

@ -58,10 +58,10 @@ struct QueryData
void SetVersion(const char *version) { rules["version"].str = version; }
int GetPlayers() const { return rules.at("players").val; }
void SetPlayers(int players) { rules["players"].val = players; }
void SetPlayers(int value) { rules["players"].val = value; }
int GetMaxPlayers() const { return rules.at("maxPlayers").val; }
void SetMaxPlayers(int players) { rules["maxPlayers"].val = players; }
void SetMaxPlayers(int value) { rules["maxPlayers"].val = value; }
const char *GetGameMode() const { return rules.at("gamemode").str.c_str(); }
void SetGameMode(const char *str) { rules["gamemode"].str = str; }

4
components/openmw-mp/Master/PacketMasterAnnounce.cpp
View file

@ -14,9 +14,9 @@ PacketMasterAnnounce::PacketMasterAnnounce(RakNet::RakPeerInterface *peer) : Bas
reliability = RELIABLE_ORDERED_WITH_ACK_RECEIPT;
}
void PacketMasterAnnounce::Packet(BitStream *bs, bool send)
void PacketMasterAnnounce::Packet(BitStream *newBitstream, bool send)
{
this->bs = bs;
bs = newBitstream;
if (send)
bs->Write(packetID);

2
components/openmw-mp/Master/PacketMasterAnnounce.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
public:
explicit PacketMasterAnnounce(RakNet::RakPeerInterface *peer);
void Packet(RakNet::BitStream *bs, bool send) override;
void Packet(RakNet::BitStream *newBitstream, bool send) override;
void SetServer(QueryData *server);
void SetFunc(uint32_t keep);

4
components/openmw-mp/Master/PacketMasterQuery.cpp
View file

@ -16,9 +16,9 @@ PacketMasterQuery::PacketMasterQuery(RakNet::RakPeerInterface *peer) : BasePacke
reliability = RELIABLE_ORDERED_WITH_ACK_RECEIPT;
}
void PacketMasterQuery::Packet(RakNet::BitStream *bs, bool send)
void PacketMasterQuery::Packet(RakNet::BitStream *newBitstream, bool send)
{
this->bs = bs;
bs = newBitstream;
if (send)
bs->Write(packetID);

2
components/openmw-mp/Master/PacketMasterQuery.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
public:
explicit PacketMasterQuery(RakNet::RakPeerInterface *peer);
void Packet(RakNet::BitStream *bs, bool send) override;
void Packet(RakNet::BitStream *newBitstream, bool send) override;
void SetServers(std::map<RakNet::SystemAddress, QueryData> *serverMap);
private:

4
components/openmw-mp/Master/PacketMasterUpdate.cpp
View file

@ -13,9 +13,9 @@ PacketMasterUpdate::PacketMasterUpdate(RakNet::RakPeerInterface *peer) : BasePac
reliability = RELIABLE_ORDERED_WITH_ACK_RECEIPT;
}
void PacketMasterUpdate::Packet(RakNet::BitStream *bs, bool send)
void PacketMasterUpdate::Packet(RakNet::BitStream *newBitstream, bool send)
{
this->bs = bs;
bs = newBitstream;
if (send)
bs->Write(packetID);

2
components/openmw-mp/Master/PacketMasterUpdate.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
public:
explicit PacketMasterUpdate(RakNet::RakPeerInterface *peer);
void Packet(RakNet::BitStream *bs, bool send) override;
void Packet(RakNet::BitStream *newBitstream, bool send) override;
void SetServer(std::pair<RakNet::SystemAddress, QueryData> *serverPair);
private:

12
components/openmw-mp/Packets/Actor/ActorPacket.cpp
View file

@ -19,15 +19,15 @@ ActorPacket::~ActorPacket()
}
void ActorPacket::setActorList(BaseActorList *actorList)
void ActorPacket::setActorList(BaseActorList *newActorList)
{
this->actorList = actorList;
actorList = newActorList;
guid = actorList->guid;
}
void ActorPacket::Packet(RakNet::BitStream *bs, bool send)
void ActorPacket::Packet(RakNet::BitStream *newBitstream, bool send)
{
if (!PacketHeader(bs, send))
if (!PacketHeader(newBitstream, send))
return;
BaseActor actor;
@ -47,9 +47,9 @@ void ActorPacket::Packet(RakNet::BitStream *bs, bool send)
}
}
bool ActorPacket::PacketHeader(RakNet::BitStream *bs, bool send)
bool ActorPacket::PacketHeader(RakNet::BitStream *newBitstream, bool send)
{
BasePacket::Packet(bs, send);
BasePacket::Packet(newBitstream, send);
RW(actorList->cell.mData, send, true);
RW(actorList->cell.mName, send, true);

6
components/openmw-mp/Packets/Actor/ActorPacket.hpp
View file

@ -19,11 +19,11 @@ namespace mwmp
~ActorPacket();
void setActorList(BaseActorList *actorList);
void setActorList(BaseActorList *newActorList);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
protected:
bool PacketHeader(RakNet::BitStream *bs, bool send);
bool PacketHeader(RakNet::BitStream *newBitstream, bool send);
virtual void Actor(BaseActor &actor, bool send);
BaseActorList *actorList;
static const int maxActors = 3000;

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

@ -8,9 +8,9 @@ PacketActorAuthority::PacketActorAuthority(RakNet::RakPeerInterface *peer) : Act
packetID = ID_ACTOR_AUTHORITY;
}
void PacketActorAuthority::Packet(RakNet::BitStream *bs, bool send)
void PacketActorAuthority::Packet(RakNet::BitStream *newBitstream, bool send)
{
BasePacket::Packet(bs, send);
BasePacket::Packet(newBitstream, send);
RW(actorList->cell.mData, send, true);
RW(actorList->cell.mName, send, true);

2
components/openmw-mp/Packets/Actor/PacketActorAuthority.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketActorAuthority(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

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

@ -8,9 +8,9 @@ PacketActorList::PacketActorList(RakNet::RakPeerInterface *peer) : ActorPacket(p
packetID = ID_ACTOR_LIST;
}
void PacketActorList::Packet(RakNet::BitStream *bs, bool send)
void PacketActorList::Packet(RakNet::BitStream *newBitstream, bool send)
{
if (!ActorPacket::PacketHeader(bs, send))
if (!ActorPacket::PacketHeader(newBitstream, send))
return;
RW(actorList->action, send);

2
components/openmw-mp/Packets/Actor/PacketActorList.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketActorList(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

14
components/openmw-mp/Packets/BasePacket.cpp
View file

@ -14,9 +14,9 @@ BasePacket::BasePacket(RakNet::RakPeerInterface *peer)
this->peer = peer;
}
void BasePacket::Packet(RakNet::BitStream *bs, bool send)
void BasePacket::Packet(RakNet::BitStream *newBitstream, bool send)
{
this->bs = bs;
bs = newBitstream;
packetValid = true;
if (send)
@ -44,12 +44,12 @@ void BasePacket::SetStreams(RakNet::BitStream *inStream, RakNet::BitStream *outS
bsSend = outStream;
}
uint32_t BasePacket::RequestData(RakNet::RakNetGUID guid)
uint32_t BasePacket::RequestData(RakNet::RakNetGUID targetGuid)
{
bsSend->ResetWritePointer();
bsSend->Write(packetID);
bsSend->Write(guid);
return peer->Send(bsSend, HIGH_PRIORITY, RELIABLE_ORDERED, orderChannel, guid, false);
bsSend->Write(targetGuid);
return peer->Send(bsSend, HIGH_PRIORITY, RELIABLE_ORDERED, orderChannel, targetGuid, false);
}
uint32_t BasePacket::Send(RakNet::AddressOrGUID destination)
@ -71,9 +71,9 @@ void BasePacket::Read()
Packet(bsRead, false);
}
void BasePacket::setGUID(RakNet::RakNetGUID guid)
void BasePacket::setGUID(RakNet::RakNetGUID newGuid)
{
this->guid = guid;
guid = newGuid;
}
RakNet::RakNetGUID BasePacket::getGUID()

6
components/openmw-mp/Packets/BasePacket.hpp
View file

@ -16,18 +16,18 @@ namespace mwmp
virtual ~BasePacket() = default;
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
virtual uint32_t Send(bool toOtherPlayers = true);
virtual uint32_t Send(RakNet::AddressOrGUID destination);
virtual void Read();
void setGUID(RakNet::RakNetGUID guid);
void setGUID(RakNet::RakNetGUID newGuid);
RakNet::RakNetGUID getGUID();
void SetReadStream(RakNet::BitStream *bitStream);
void SetSendStream(RakNet::BitStream *bitStream);
void SetStreams(RakNet::BitStream *inStream, RakNet::BitStream *outStream);
virtual uint32_t RequestData(RakNet::RakNetGUID guid);
virtual uint32_t RequestData(RakNet::RakNetGUID targetGuid);
static inline uint32_t headerSize()
{

12
components/openmw-mp/Packets/Object/ObjectPacket.cpp
View file

@ -20,15 +20,15 @@ ObjectPacket::~ObjectPacket()
}
void ObjectPacket::setObjectList(BaseObjectList *objectList)
void ObjectPacket::setObjectList(BaseObjectList *newObjectList)
{
this->objectList = objectList;
objectList = newObjectList;
guid = objectList->guid;
}
void ObjectPacket::Packet(RakNet::BitStream *bs, bool send)
void ObjectPacket::Packet(RakNet::BitStream *newBitstream, bool send)
{
if (!PacketHeader(bs, send))
if (!PacketHeader(newBitstream, send))
return;
BaseObject baseObject;
@ -44,9 +44,9 @@ void ObjectPacket::Packet(RakNet::BitStream *bs, bool send)
}
}
bool ObjectPacket::PacketHeader(RakNet::BitStream *bs, bool send)
bool ObjectPacket::PacketHeader(RakNet::BitStream *newBitstream, bool send)
{
BasePacket::Packet(bs, send);
BasePacket::Packet(newBitstream, send);
RW(objectList->packetOrigin, send);

6
components/openmw-mp/Packets/Object/ObjectPacket.hpp
View file

@ -19,13 +19,13 @@ namespace mwmp
~ObjectPacket();
void setObjectList(BaseObjectList *objectList);
void setObjectList(BaseObjectList *newObjectList);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
protected:
virtual void Object(BaseObject &baseObject, bool send);
bool PacketHeader(RakNet::BitStream *bs, bool send);
bool PacketHeader(RakNet::BitStream *newBitstream, bool send);
BaseObjectList *objectList;
static const int maxObjects = 3000;
bool hasCellData;

4
components/openmw-mp/Packets/Object/PacketConsoleCommand.cpp
View file

@ -9,9 +9,9 @@ PacketConsoleCommand::PacketConsoleCommand(RakNet::RakPeerInterface *peer) : Obj
hasCellData = true;
}
void PacketConsoleCommand::Packet(RakNet::BitStream *bs, bool send)
void PacketConsoleCommand::Packet(RakNet::BitStream *newBitstream, bool send)
{
if (!PacketHeader(bs, send))
if (!PacketHeader(newBitstream, send))
return;
RW(objectList->consoleCommand, send);

2
components/openmw-mp/Packets/Object/PacketConsoleCommand.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketConsoleCommand(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

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

@ -10,9 +10,9 @@ PacketContainer::PacketContainer(RakNet::RakPeerInterface *peer) : ObjectPacket(
hasCellData = true;
}
void PacketContainer::Packet(RakNet::BitStream *bs, bool send)
void PacketContainer::Packet(RakNet::BitStream *newBitstream, bool send)
{
if (!PacketHeader(bs, send))
if (!PacketHeader(newBitstream, send))
return;
RW(objectList->action, send);

2
components/openmw-mp/Packets/Object/PacketContainer.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketContainer(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Object/PacketObjectActivate.cpp
View file

@ -9,9 +9,9 @@ PacketObjectActivate::PacketObjectActivate(RakNet::RakPeerInterface *peer) : Obj
hasCellData = true;
}
void PacketObjectActivate::Packet(RakNet::BitStream *bs, bool send)
void PacketObjectActivate::Packet(RakNet::BitStream *newBitstream, bool send)
{
if (!PacketHeader(bs, send))
if (!PacketHeader(newBitstream, send))
return;
BaseObject baseObject;

2
components/openmw-mp/Packets/Object/PacketObjectActivate.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketObjectActivate(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

8
components/openmw-mp/Packets/PacketPreInit.cpp
View file

@ -7,9 +7,9 @@ mwmp::PacketPreInit::PacketPreInit(RakNet::RakPeerInterface *peer) : BasePacket(
packetID = ID_GAME_PREINIT;
}
void mwmp::PacketPreInit::Packet(RakNet::BitStream *bs, bool send)
void mwmp::PacketPreInit::Packet(RakNet::BitStream *newBitstream, bool send)
{
BasePacket::Packet(bs, send);
BasePacket::Packet(newBitstream, send);
const RakNet::BitSize_t packetSize = bs->GetNumberOfBytesUsed();
uint32_t expectedPacketSize = BasePacket::headerSize() + sizeof(uint32_t);
@ -88,7 +88,7 @@ void mwmp::PacketPreInit::Packet(RakNet::BitStream *bs, bool send)
}
}
void mwmp::PacketPreInit::setChecksums(mwmp::PacketPreInit::PluginContainer *checksums)
void mwmp::PacketPreInit::setChecksums(mwmp::PacketPreInit::PluginContainer *newChecksums)
{
this->checksums = checksums;
checksums = newChecksums;
}

2
components/openmw-mp/Packets/PacketPreInit.hpp
View file

@ -16,7 +16,7 @@ namespace mwmp
PacketPreInit(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
void setChecksums(PluginContainer *checksums);
private:
PluginContainer *checksums;

4
components/openmw-mp/Packets/Player/PacketChatMessage.cpp
View file

@ -7,9 +7,9 @@ mwmp::PacketChatMessage::PacketChatMessage(RakNet::RakPeerInterface *peer) : Pla
orderChannel = CHANNEL_SYSTEM;
}
void mwmp::PacketChatMessage::Packet(RakNet::BitStream *bs, bool send)
void mwmp::PacketChatMessage::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->chatMessage, send);
}

2
components/openmw-mp/Packets/Player/PacketChatMessage.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketChatMessage(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketGUIBoxes.cpp
View file

@ -9,9 +9,9 @@ PacketGUIBoxes::PacketGUIBoxes(RakNet::RakPeerInterface *peer) : PlayerPacket(pe
orderChannel = CHANNEL_SYSTEM;
}
void PacketGUIBoxes::Packet(RakNet::BitStream *bs, bool send)
void PacketGUIBoxes::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->guiMessageBox.id, send);
RW(player->guiMessageBox.type, send);

2
components/openmw-mp/Packets/Player/PacketGUIBoxes.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketGUIBoxes(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketGameSettings.cpp
View file

@ -9,9 +9,9 @@ PacketGameSettings::PacketGameSettings(RakNet::RakPeerInterface *peer) : PlayerP
orderChannel = CHANNEL_SYSTEM;
}
void PacketGameSettings::Packet(RakNet::BitStream *bs, bool send)
void PacketGameSettings::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->difficulty, send);
RW(player->consoleAllowed, send);

2
components/openmw-mp/Packets/Player/PacketGameSettings.hpp
View file

@ -11,7 +11,7 @@ namespace mwmp
public:
PacketGameSettings(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.cpp
View file

@ -8,9 +8,9 @@ PacketPlayerActiveSkills::PacketPlayerActiveSkills(RakNet::RakPeerInterface *pee
packetID = ID_PLAYER_ACTIVESKILLS;
}
void PacketPlayerActiveSkills::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerActiveSkills::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
uint32_t spells = 0;

2
components/openmw-mp/Packets/Player/PacketPlayerActiveSkills.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerActiveSkills(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerAnimFlags.cpp
View file

@ -6,9 +6,9 @@ mwmp::PacketPlayerAnimFlags::PacketPlayerAnimFlags(RakNet::RakPeerInterface *pee
packetID = ID_PLAYER_ANIM_FLAGS;
}
void mwmp::PacketPlayerAnimFlags::Packet(RakNet::BitStream *bs, bool send)
void mwmp::PacketPlayerAnimFlags::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->movementFlags, send);
RW(player->drawState, send);

2
components/openmw-mp/Packets/Player/PacketPlayerAnimFlags.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerAnimFlags(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerAnimPlay.cpp
View file

@ -6,9 +6,9 @@ mwmp::PacketPlayerAnimPlay::PacketPlayerAnimPlay(RakNet::RakPeerInterface *peer)
packetID = ID_PLAYER_ANIM_PLAY;
}
void mwmp::PacketPlayerAnimPlay::Packet(RakNet::BitStream *bs, bool send)
void mwmp::PacketPlayerAnimPlay::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->animation.groupname, send);
RW(player->animation.mode, send);

2
components/openmw-mp/Packets/Player/PacketPlayerAnimPlay.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerAnimPlay(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerAttack.cpp
View file

@ -8,9 +8,9 @@ PacketPlayerAttack::PacketPlayerAttack(RakNet::RakPeerInterface *peer) : PlayerP
packetID = ID_PLAYER_ATTACK;
}
void PacketPlayerAttack::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerAttack::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->attack.target.isPlayer, send);

2
components/openmw-mp/Packets/Player/PacketPlayerAttack.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerAttack(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerAttribute.cpp
View file

@ -9,9 +9,9 @@ PacketPlayerAttribute::PacketPlayerAttribute(RakNet::RakPeerInterface *peer) : P
packetID = ID_PLAYER_ATTRIBUTE;
}
void PacketPlayerAttribute::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerAttribute::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->exchangeFullInfo, send);

2
components/openmw-mp/Packets/Player/PacketPlayerAttribute.hpp
View file

@ -11,7 +11,7 @@ namespace mwmp
const static int AttributeCount = 8;
PacketPlayerAttribute(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerBaseInfo.cpp
View file

@ -8,9 +8,9 @@ PacketPlayerBaseInfo::PacketPlayerBaseInfo(RakNet::RakPeerInterface *peer) : Pla
packetID = ID_PLAYER_BASEINFO;
}
void PacketPlayerBaseInfo::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerBaseInfo::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->npc.mName, send, true);
RW(player->npc.mModel, send, true);

2
components/openmw-mp/Packets/Player/PacketPlayerBaseInfo.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerBaseInfo(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerBehavior.cpp
View file

@ -8,9 +8,9 @@ PacketPlayerBehavior::PacketPlayerBehavior(RakNet::RakPeerInterface *peer) : Pla
packetID = ID_PLAYER_BEHAVIOR;
}
void PacketPlayerBehavior::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerBehavior::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
// Placeholder
}

2
components/openmw-mp/Packets/Player/PacketPlayerBehavior.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerBehavior(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerBook.cpp
View file

@ -9,9 +9,9 @@ PacketPlayerBook::PacketPlayerBook(RakNet::RakPeerInterface *peer) : PlayerPacke
packetID = ID_PLAYER_BOOK;
}
void PacketPlayerBook::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerBook::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
uint32_t count;

2
components/openmw-mp/Packets/Player/PacketPlayerBook.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerBook(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerBounty.cpp
View file

@ -8,9 +8,9 @@ PacketPlayerBounty::PacketPlayerBounty(RakNet::RakPeerInterface *peer) : PlayerP
packetID = ID_PLAYER_BOUNTY;
}
void PacketPlayerBounty::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerBounty::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->npcStats.mBounty, send);
}

2
components/openmw-mp/Packets/Player/PacketPlayerBounty.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerBounty(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerCast.cpp
View file

@ -10,9 +10,9 @@ PacketPlayerCast::PacketPlayerCast(RakNet::RakPeerInterface *peer) : PlayerPacke
packetID = ID_PLAYER_CAST;
}
void PacketPlayerCast::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerCast::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->cast.target.isPlayer, send);

2
components/openmw-mp/Packets/Player/PacketPlayerCast.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerCast(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerCellChange.cpp
View file

@ -9,9 +9,9 @@ mwmp::PacketPlayerCellChange::PacketPlayerCellChange(RakNet::RakPeerInterface *p
reliability = RELIABLE_ORDERED;
}
void mwmp::PacketPlayerCellChange::Packet(RakNet::BitStream *bs, bool send)
void mwmp::PacketPlayerCellChange::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->cell.mData, send, true);
RW(player->cell.mName, send, true);

2
components/openmw-mp/Packets/Player/PacketPlayerCellChange.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerCellChange(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

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

@ -9,9 +9,9 @@ mwmp::PacketPlayerCellState::PacketPlayerCellState(RakNet::RakPeerInterface *pee
reliability = RELIABLE_ORDERED;
}
void mwmp::PacketPlayerCellState::Packet(RakNet::BitStream *bs, bool send)
void mwmp::PacketPlayerCellState::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
uint32_t count;

2
components/openmw-mp/Packets/Player/PacketPlayerCellState.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerCellState(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerCharGen.cpp
View file

@ -6,9 +6,9 @@ mwmp::PacketPlayerCharGen::PacketPlayerCharGen(RakNet::RakPeerInterface *peer) :
packetID = ID_PLAYER_CHARGEN;
}
void mwmp::PacketPlayerCharGen::Packet(RakNet::BitStream *bs, bool send)
void mwmp::PacketPlayerCharGen::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->charGenState, send);

2
components/openmw-mp/Packets/Player/PacketPlayerCharGen.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerCharGen(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerClass.cpp
View file

@ -6,9 +6,9 @@ mwmp::PacketPlayerClass::PacketPlayerClass(RakNet::RakPeerInterface *peer) : Pla
packetID = ID_PLAYER_CHARCLASS;
}
void mwmp::PacketPlayerClass::Packet(RakNet::BitStream *bs, bool send)
void mwmp::PacketPlayerClass::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->charClass.mId, send);

2
components/openmw-mp/Packets/Player/PacketPlayerClass.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerClass(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerDeath.cpp
View file

@ -8,9 +8,9 @@ PacketPlayerDeath::PacketPlayerDeath(RakNet::RakPeerInterface *peer) : PlayerPac
packetID = ID_PLAYER_DEATH;
}
void PacketPlayerDeath::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerDeath::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->deathState, send);
RW(player->killer.isPlayer, send);

2
components/openmw-mp/Packets/Player/PacketPlayerDeath.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerDeath(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerEquipment.cpp
View file

@ -9,9 +9,9 @@ PacketPlayerEquipment::PacketPlayerEquipment(RakNet::RakPeerInterface *peer) : P
packetID = ID_PLAYER_EQUIPMENT;
}
void PacketPlayerEquipment::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerEquipment::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->exchangeFullInfo, send);

2
components/openmw-mp/Packets/Player/PacketPlayerEquipment.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerEquipment(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
void ExchangeItemInformation(Item &item, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerFaction.cpp
View file

@ -9,9 +9,9 @@ PacketPlayerFaction::PacketPlayerFaction(RakNet::RakPeerInterface *peer) : Playe
packetID = ID_PLAYER_FACTION;
}
void PacketPlayerFaction::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerFaction::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->factionChanges.action, send);

2
components/openmw-mp/Packets/Player/PacketPlayerFaction.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerFaction(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerInput.cpp
View file

@ -8,9 +8,9 @@ PacketPlayerInput::PacketPlayerInput(RakNet::RakPeerInterface *peer) : PlayerPac
packetID = ID_PLAYER_INPUT;
}
void PacketPlayerInput::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerInput::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
// Placeholder
}

2
components/openmw-mp/Packets/Player/PacketPlayerInput.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerInput(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

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

@ -9,9 +9,9 @@ PacketPlayerInventory::PacketPlayerInventory(RakNet::RakPeerInterface *peer) : P
packetID = ID_PLAYER_INVENTORY;
}
void PacketPlayerInventory::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerInventory::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->inventoryChanges.action, send);

2
components/openmw-mp/Packets/Player/PacketPlayerInventory.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerInventory(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerItemUse.cpp
View file

@ -8,9 +8,9 @@ PacketPlayerItemUse::PacketPlayerItemUse(RakNet::RakPeerInterface *peer) : Playe
packetID = ID_PLAYER_ITEM_USE;
}
void PacketPlayerItemUse::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerItemUse::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->usedItem.refId, send, true);
RW(player->usedItem.count, send);

2
components/openmw-mp/Packets/Player/PacketPlayerItemUse.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerItemUse(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerJail.cpp
View file

@ -9,9 +9,9 @@ PacketPlayerJail::PacketPlayerJail(RakNet::RakPeerInterface *peer) : PlayerPacke
packetID = ID_PLAYER_JAIL;
}
void PacketPlayerJail::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerJail::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->jailDays, send);
RW(player->ignoreJailTeleportation, send);

2
components/openmw-mp/Packets/Player/PacketPlayerJail.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerJail(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

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

@ -9,9 +9,9 @@ PacketPlayerJournal::PacketPlayerJournal(RakNet::RakPeerInterface *peer) : Playe
packetID = ID_PLAYER_JOURNAL;
}
void PacketPlayerJournal::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerJournal::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
uint32_t count;

2
components/openmw-mp/Packets/Player/PacketPlayerJournal.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerJournal(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerLevel.cpp
View file

@ -8,9 +8,9 @@ PacketPlayerLevel::PacketPlayerLevel(RakNet::RakPeerInterface *peer) : PlayerPac
packetID = ID_PLAYER_LEVEL;
}
void PacketPlayerLevel::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerLevel::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->creatureStats.mLevel, send);

2
components/openmw-mp/Packets/Player/PacketPlayerLevel.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerLevel(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerMiscellaneous.cpp
View file

@ -8,9 +8,9 @@ PacketPlayerMiscellaneous::PacketPlayerMiscellaneous(RakNet::RakPeerInterface *p
packetID = ID_PLAYER_MISCELLANEOUS;
}
void PacketPlayerMiscellaneous::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerMiscellaneous::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->miscellaneousChangeType, send);

2
components/openmw-mp/Packets/Player/PacketPlayerMiscellaneous.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerMiscellaneous(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerMomentum.cpp
View file

@ -9,9 +9,9 @@ PacketPlayerMomentum::PacketPlayerMomentum(RakNet::RakPeerInterface *peer) : Pla
priority = MEDIUM_PRIORITY;
}
void PacketPlayerMomentum::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerMomentum::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->momentum.pos, send, true);
}

2
components/openmw-mp/Packets/Player/PacketPlayerMomentum.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerMomentum(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerPosition.cpp
View file

@ -11,9 +11,9 @@ PacketPlayerPosition::PacketPlayerPosition(RakNet::RakPeerInterface *peer) : Pla
//reliability = UNRELIABLE_SEQUENCED;
}
void PacketPlayerPosition::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerPosition::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->position, send, 1);
RW(player->direction, send, 1);

2
components/openmw-mp/Packets/Player/PacketPlayerPosition.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerPosition(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerQuickKeys.cpp
View file

@ -9,9 +9,9 @@ PacketPlayerQuickKeys::PacketPlayerQuickKeys(RakNet::RakPeerInterface *peer) : P
packetID = ID_PLAYER_QUICKKEYS;
}
void PacketPlayerQuickKeys::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerQuickKeys::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
uint32_t count;

2
components/openmw-mp/Packets/Player/PacketPlayerQuickKeys.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerQuickKeys(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerRegionAuthority.cpp
View file

@ -8,9 +8,9 @@ mwmp::PacketWorldRegionAuthority::PacketWorldRegionAuthority(RakNet::RakPeerInte
reliability = RELIABLE_ORDERED;
}
void mwmp::PacketWorldRegionAuthority::Packet(RakNet::BitStream *bs, bool send)
void mwmp::PacketWorldRegionAuthority::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->authorityRegion, send, true);
}

4
components/openmw-mp/Packets/Player/PacketPlayerReputation.cpp
View file

@ -8,9 +8,9 @@ PacketPlayerReputation::PacketPlayerReputation(RakNet::RakPeerInterface *peer) :
packetID = ID_PLAYER_REPUTATION;
}
void PacketPlayerReputation::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerReputation::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->npcStats.mReputation, send);
}

2
components/openmw-mp/Packets/Player/PacketPlayerReputation.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerReputation(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerRest.cpp
View file

@ -8,9 +8,9 @@ PacketPlayerRest::PacketPlayerRest(RakNet::RakPeerInterface *peer) : PlayerPacke
packetID = ID_PLAYER_REST;
}
void PacketPlayerRest::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerRest::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
// Placeholder to be filled in later
}

2
components/openmw-mp/Packets/Player/PacketPlayerRest.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerRest(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerResurrect.cpp
View file

@ -9,9 +9,9 @@ PacketPlayerResurrect::PacketPlayerResurrect(RakNet::RakPeerInterface *peer) : P
packetID = ID_PLAYER_RESURRECT;
}
void PacketPlayerResurrect::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerResurrect::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->resurrectType, send);
}

2
components/openmw-mp/Packets/Player/PacketPlayerResurrect.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerResurrect(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerShapeshift.cpp
View file

@ -8,9 +8,9 @@ PacketPlayerShapeshift::PacketPlayerShapeshift(RakNet::RakPeerInterface *peer) :
packetID = ID_PLAYER_SHAPESHIFT;
}
void PacketPlayerShapeshift::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerShapeshift::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->scale, send);
RW(player->isWerewolf, send);

2
components/openmw-mp/Packets/Player/PacketPlayerShapeshift.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerShapeshift(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerSkill.cpp
View file

@ -10,9 +10,9 @@ PacketPlayerSkill::PacketPlayerSkill(RakNet::RakPeerInterface *peer) : PlayerPac
packetID = ID_PLAYER_SKILL;
}
void PacketPlayerSkill::Packet(RakNet::BitStream *bs, bool send)
void PacketPlayerSkill::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->exchangeFullInfo, send);

2
components/openmw-mp/Packets/Player/PacketPlayerSkill.hpp
View file

@ -12,7 +12,7 @@ namespace mwmp
const static int AttributeCount = 8;
PacketPlayerSkill(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

4
components/openmw-mp/Packets/Player/PacketPlayerSpeech.cpp
View file

@ -6,9 +6,9 @@ mwmp::PacketPlayerSpeech::PacketPlayerSpeech(RakNet::RakPeerInterface *peer) : P
packetID = ID_PLAYER_SPEECH;
}
void mwmp::PacketPlayerSpeech::Packet(RakNet::BitStream *bs, bool send)
void mwmp::PacketPlayerSpeech::Packet(RakNet::BitStream *newBitstream, bool send)
{
PlayerPacket::Packet(bs, send);
PlayerPacket::Packet(newBitstream, send);
RW(player->sound, send);
}

2
components/openmw-mp/Packets/Player/PacketPlayerSpeech.hpp
View file

@ -10,7 +10,7 @@ namespace mwmp
public:
PacketPlayerSpeech(RakNet::RakPeerInterface *peer);
virtual void Packet(RakNet::BitStream *bs, bool send);
virtual void Packet(RakNet::BitStream *newBitstream, bool send);
};
}

Some files were not shown because too many files have changed in this diff Show more