Merge branch 'main' into moreMovementAi

This commit is contained in:
David Markowitz
2024-02-27 04:14:36 -08:00
264 changed files with 1945 additions and 1948 deletions

View File

@@ -17,11 +17,11 @@ ScriptComponent::~ScriptComponent() {
}
void ScriptComponent::Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) {
void ScriptComponent::Serialize(RakNet::BitStream& outBitStream, bool bIsInitialUpdate) {
if (bIsInitialUpdate) {
const auto& networkSettings = m_Parent->GetNetworkSettings();
auto hasNetworkSettings = !networkSettings.empty();
outBitStream->Write(hasNetworkSettings);
outBitStream.Write(hasNetworkSettings);
if (hasNetworkSettings) {
@@ -31,12 +31,12 @@ void ScriptComponent::Serialize(RakNet::BitStream* outBitStream, bool bIsInitial
ldfData.Write<uint32_t>(networkSettings.size());
for (auto* networkSetting : networkSettings) {
networkSetting->WriteToPacket(&ldfData);
networkSetting->WriteToPacket(ldfData);
}
// Finally write everything to the stream
outBitStream->Write<uint32_t>(ldfData.GetNumberOfBytesUsed());
outBitStream->Write(ldfData);
outBitStream.Write<uint32_t>(ldfData.GetNumberOfBytesUsed());
outBitStream.Write(ldfData);
}
}
}

View File

@@ -24,7 +24,7 @@ public:
ScriptComponent(Entity* parent, std::string scriptName, bool serialized, bool client = false);
~ScriptComponent() override;
void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) override;
void Serialize(RakNet::BitStream& outBitStream, bool bIsInitialUpdate) override;
/**
* Returns the script that's attached to this entity