Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-25 15:07:28 +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
commit 92d36496df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 15 additions and 15 deletions
Show Stats 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; m_CoinsA = coins;
} }
else if (participant = m_ParticipantB) else if (participant == m_ParticipantB)
{ {
m_CoinsB = coins; m_CoinsB = coins;
} }
@ -72,7 +72,7 @@ void Trade::SetItems(LWOOBJID participant, std::vector<TradeItem> items)
{ {
m_ItemsA = items; m_ItemsA = items;
} }
else if (participant = m_ParticipantB) else if (participant == m_ParticipantB)
{ {
m_ItemsB = items; m_ItemsB = items;
} }

2
dGame/dComponents/BuffComponent.h
View File

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

4
dGame/dComponents/MissionComponent.h
View File

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

2
dGame/dComponents/MovementAIComponent.h
View File

@ -61,7 +61,7 @@ public:
MovementAIComponent(Entity* parentEntity, MovementAIInfo info); MovementAIComponent(Entity* parentEntity, MovementAIInfo info);
~MovementAIComponent() override; ~MovementAIComponent() override;
void Update(float deltaTime); void Update(float deltaTime) override;
/** /**
* Returns the basic settings that this entity uses to move around * 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 Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, unsigned int& flags);
void OnUse(Entity* originator); void OnUse(Entity* originator) override;
/** /**
* Gets the buy scaler * Gets the buy scaler

2
dScripts/AmDrawBridge.h
View File

@ -7,7 +7,7 @@ public:
void OnStartup(Entity* self) override; void OnStartup(Entity* self) override;
void OnUse(Entity* self, Entity* user) override; void OnUse(Entity* self, Entity* user) override;
void OnTimerDone(Entity* self, std::string timerName) override; void OnTimerDone(Entity* self, std::string timerName) override;
void OnNotifyObject(Entity *self, Entity *sender, const std::string& name, int32_t param1 = 0, int32_t param2 = 0); void OnNotifyObject(Entity *self, Entity *sender, const std::string& name, int32_t param1 = 0, int32_t param2 = 0) override;
void MoveBridgeDown(Entity* self, Entity* bridge, bool down); void MoveBridgeDown(Entity* self, Entity* bridge, bool down);
void NotifyDie(Entity* self, Entity* other); void NotifyDie(Entity* self, Entity* other);

2
dScripts/BaseConsoleTeleportServer.cpp
View File

@ -25,7 +25,7 @@ void BaseConsoleTeleportServer::BaseOnMessageBoxResponse(Entity* self, Entity* s
if (rocketLaunchComponent == nullptr) if (rocketLaunchComponent == nullptr)
{ {
rocketLaunchComponent; return;
} }
const auto& teleportZone = self->GetVar<std::u16string>(u"transferZoneID"); const auto& teleportZone = self->GetVar<std::u16string>(u"transferZoneID");

8
dScripts/GfCampfire.h
View File

@ -4,11 +4,11 @@
class GfCampfire : public CppScripts::Script class GfCampfire : public CppScripts::Script
{ {
public: public:
void OnStartup(Entity* self); void OnStartup(Entity* self) override;
void OnFireEventServerSide(Entity *self, Entity *sender, std::string args, int32_t param1, int32_t param2, void OnFireEventServerSide(Entity *self, Entity *sender, std::string args, int32_t param1, int32_t param2,
int32_t param3); int32_t param3) override;
void OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status); void OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status) override;
void OnTimerDone(Entity* self, std::string timerName); void OnTimerDone(Entity* self, std::string timerName) override;
void OnSkillEventFired(Entity *self, Entity *caster, const std::string &message) override; void OnSkillEventFired(Entity *self, Entity *caster, const std::string &message) override;
private: private:
int32_t m_skillCastId = 43; int32_t m_skillCastId = 43;