Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-05-23 07:12:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
wincent 2023-05-07 10:27:04 +02:00
parent cae0164c73
commit 13f3da52c0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dGame/dUtilities/SlashCommandHandler.cpp
View File

@ -703,7 +703,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
} }
#endif #endif
if (chatCommand == "addmission" && entity->GetGMLevel() >= GAME_MASTER_LEVEL_DEVELOPER) { if (chatCommand == "addmission" && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER) {
if (args.size() == 0) return; if (args.size() == 0) return;
uint32_t missionID; uint32_t missionID;

1
dScripts/ScriptComponent.h
View File

@ -22,6 +22,7 @@ public:
static const eReplicaComponentType ComponentType = eReplicaComponentType::SCRIPT; static const eReplicaComponentType ComponentType = eReplicaComponentType::SCRIPT;
ScriptComponent(Entity* parent, std::string scriptName, bool serialized, bool client = false); ScriptComponent(Entity* parent, std::string scriptName, bool serialized, bool client = false);
ScriptComponent(Entity* parent, bool serialized, bool client = false);
~ScriptComponent() override; ~ScriptComponent() override;
void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, unsigned int& flags); void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, unsigned int& flags);