Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-24 14:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

update serialization, remove unused variable (#1501)

Browse Source 
Tested that players show up as normal on each others screens, tested that money magnet still works with item 8600, tested that gravity still works in Moon Base.
This commit is contained in:
David Markowitz 2024-03-09 23:15:43 -08:00 committed by GitHub
parent 0b4f70a76b
commit b9092a3cce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dGame/dComponents/ControllablePhysicsComponent.cpp
View File

@ -26,7 +26,6 @@ ControllablePhysicsComponent::ControllablePhysicsComponent(Entity* entity) : Phy
m_SpeedMultiplier = 1; m_SpeedMultiplier = 1;
m_GravityScale = 1; m_GravityScale = 1;
m_DirtyCheats = false; m_DirtyCheats = false;
m_IgnoreMultipliers = false;
m_DirtyEquippedItemInfo = true; m_DirtyEquippedItemInfo = true;
m_PickupRadius = 0.0f; m_PickupRadius = 0.0f;
@ -92,31 +91,31 @@ void ControllablePhysicsComponent::Serialize(RakNet::BitStream& outBitStream, bo
outBitStream.Write(m_ImmuneToStunInteractCount); outBitStream.Write(m_ImmuneToStunInteractCount);
} }
if (m_IgnoreMultipliers) m_DirtyCheats = false; outBitStream.Write(m_DirtyCheats || bIsInitialUpdate);
if (m_DirtyCheats || bIsInitialUpdate) {
outBitStream.Write(m_DirtyCheats);
if (m_DirtyCheats) {
outBitStream.Write(m_GravityScale); outBitStream.Write(m_GravityScale);
outBitStream.Write(m_SpeedMultiplier); outBitStream.Write(m_SpeedMultiplier);
m_DirtyCheats = false; if (!bIsInitialUpdate) m_DirtyCheats = false;
} }
outBitStream.Write(m_DirtyEquippedItemInfo); outBitStream.Write(m_DirtyEquippedItemInfo || bIsInitialUpdate);
if (m_DirtyEquippedItemInfo) { if (m_DirtyEquippedItemInfo || bIsInitialUpdate) {
outBitStream.Write(m_PickupRadius); outBitStream.Write(m_PickupRadius);
outBitStream.Write(m_InJetpackMode); outBitStream.Write(m_InJetpackMode);
m_DirtyEquippedItemInfo = false;
if (!bIsInitialUpdate) m_DirtyEquippedItemInfo = false;
} }
outBitStream.Write(m_DirtyBubble); outBitStream.Write(m_DirtyBubble || bIsInitialUpdate);
if (m_DirtyBubble) { if (m_DirtyBubble || bIsInitialUpdate) {
outBitStream.Write(m_IsInBubble); outBitStream.Write(m_IsInBubble);
if (m_IsInBubble) { if (m_IsInBubble) {
outBitStream.Write(m_BubbleType); outBitStream.Write(m_BubbleType);
outBitStream.Write(m_SpecialAnims); outBitStream.Write(m_SpecialAnims);
} }
m_DirtyBubble = false;
if (!bIsInitialUpdate) m_DirtyBubble = false;
} }
outBitStream.Write(m_DirtyPosition || bIsInitialUpdate); outBitStream.Write(m_DirtyPosition || bIsInitialUpdate);
@ -149,7 +148,8 @@ void ControllablePhysicsComponent::Serialize(RakNet::BitStream& outBitStream, bo
outBitStream.Write(m_AngularVelocity.z); outBitStream.Write(m_AngularVelocity.z);
} }
outBitStream.Write0(); outBitStream.Write0(); // local_space_info, always zero for now.
if (!bIsInitialUpdate) { if (!bIsInitialUpdate) {
m_DirtyPosition = false; m_DirtyPosition = false;
outBitStream.Write(m_IsTeleporting); outBitStream.Write(m_IsTeleporting);

17
dGame/dComponents/ControllablePhysicsComponent.h
View File

@ -174,18 +174,6 @@ public:
*/ */
const float GetGravityScale() const { return m_GravityScale; } const float GetGravityScale() const { return m_GravityScale; }
/**
* Sets the ignore multipliers value, allowing you to skip the serialization of speed and gravity multipliers
* @param value whether or not to ignore multipliers
*/
void SetIgnoreMultipliers(bool value) { m_IgnoreMultipliers = value; }
/**
* Returns the current ignore multipliers value
* @return the current ignore multipliers value
*/
const bool GetIgnoreMultipliers() const { return m_IgnoreMultipliers; }
/** /**
* Can make an entity static, making it unable to move around * Can make an entity static, making it unable to move around
* @param value whether or not the entity is static * @param value whether or not the entity is static
@ -353,11 +341,6 @@ private:
*/ */
bool m_DirtyCheats; bool m_DirtyCheats;
/**
* Makes it so that the speed multiplier and gravity scale are no longer serialized if false
*/
bool m_IgnoreMultipliers;
/** /**
* Whether this entity is static, making it unable to move * Whether this entity is static, making it unable to move
*/ */