Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-08-04 17:54:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #490 from EmosewaMC/macos_compilation_warnings

Browse Source 
Resolved MacOS (and possibly ARM?) compilation warnings
This commit is contained in:
David Markowitz
2022-04-07 12:09:37 -07:00
committed by GitHub
parent 9b6caef6b5 9d79fc3d2e
commit 92d36496df
10 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dGame/TradingManager.cpp
View File

@@ -60,7 +60,7 @@ void Trade::SetCoins(LWOOBJID participant, uint64_t coins)
{
m_CoinsA = coins;
}
else if (participant = m_ParticipantB)
else if (participant == m_ParticipantB)
{
m_CoinsB = coins;
}
@@ -72,7 +72,7 @@ void Trade::SetItems(LWOOBJID participant, std::vector<TradeItem> items)
{
m_ItemsA = items;
}
else if (participant = m_ParticipantB)
else if (participant == m_ParticipantB)
{
m_ItemsB = items;
}

2
dGame/dComponents/BuffComponent.h
View File

@@ -51,7 +51,7 @@ public:
void LoadFromXML(tinyxml2::XMLDocument* doc);
void UpdateXml(tinyxml2::XMLDocument* doc);
void UpdateXml(tinyxml2::XMLDocument* doc) override;
void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, unsigned int& flags);

2
dGame/dComponents/ControllablePhysicsComponent.h
View File

@@ -23,7 +23,7 @@ public:
ControllablePhysicsComponent(Entity* entity);
~ControllablePhysicsComponent() override;
void Update(float deltaTime);
void Update(float deltaTime) override;
void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, unsigned int& flags);
void LoadFromXML(tinyxml2::XMLDocument* doc);
void ResetFlags();

4
dGame/dComponents/MissionComponent.h
View File

@@ -29,8 +29,8 @@ public:
explicit MissionComponent(Entity* parent);
~MissionComponent() override;
void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, unsigned int& flags);
void LoadFromXml(tinyxml2::XMLDocument* doc);
void UpdateXml(tinyxml2::XMLDocument* doc);
void LoadFromXml(tinyxml2::XMLDocument* doc) override;
void UpdateXml(tinyxml2::XMLDocument* doc) override;
/**
* Returns all the missions for this entity, mapped by mission ID

2
dGame/dComponents/ModuleAssemblyComponent.h
View File

@@ -17,7 +17,7 @@ public:
~ModuleAssemblyComponent() override;
void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, unsigned int& flags);
void Update(float deltaTime);
void Update(float deltaTime) override;
/**
* Sets the subkey of this entity

2
dGame/dComponents/MovementAIComponent.h
View File

@@ -61,7 +61,7 @@ public:
MovementAIComponent(Entity* parentEntity, MovementAIInfo info);
~MovementAIComponent() override;
void Update(float deltaTime);
void Update(float deltaTime) override;
/**
* Returns the basic settings that this entity uses to move around

2
dGame/dComponents/VendorComponent.h
View File

@@ -19,7 +19,7 @@ public:
void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, unsigned int& flags);
void OnUse(Entity* originator);
void OnUse(Entity* originator) override;
/**
* Gets the buy scaler