Skip to content

Commit 3b545cd

Browse files
committed
Fix missing rename
1 parent 6752784 commit 3b545cd

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

Server/mods/deathmatch/logic/CElement.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ void CElement::ReadCustomData(CEvents* pEvents, CXMLNode& Node)
508508
}
509509
}
510510

511-
CLuaArgument* CElement::GetCustomData(const char* szName, bool bInheritData, ESyncType* pSyncType, ECustomDataClientTrust* clientChangesMode)
511+
CLuaArgument* CElement::GetCustomData(const char* szName, bool bInheritData, ESyncType* pSyncType, eCustomDataClientTrust* clientChangesMode)
512512
{
513513
assert(szName);
514514

Server/mods/deathmatch/logic/CElement.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ class CElement
136136

137137
void ReadCustomData(CEvents* pEvents, CXMLNode& Node);
138138
CCustomData& GetCustomDataManager() { return m_CustomData; }
139-
CLuaArgument* GetCustomData(const char* szName, bool bInheritData, ESyncType* pSyncType = nullptr, ECustomDataClientTrust* clientChangesMode = nullptr);
139+
CLuaArgument* GetCustomData(const char* szName, bool bInheritData, ESyncType* pSyncType = nullptr, eCustomDataClientTrust* clientChangesMode = nullptr);
140140
CLuaArguments* GetAllCustomData(CLuaArguments* table);
141141
bool GetCustomDataString(const char* szName, char* pOut, size_t sizeBuffer, bool bInheritData);
142142
bool GetCustomDataInt(const char* szName, int& iOut, bool bInheritData);

Server/mods/deathmatch/logic/CGame.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2653,12 +2653,12 @@ void CGame::Packet_CustomData(CCustomDataPacket& Packet)
26532653
}
26542654

26552655
ESyncType lastSyncType = ESyncType::BROADCAST;
2656-
ECustomDataClientTrust clientChangesMode{};
2656+
eCustomDataClientTrust clientChangesMode{};
26572657

26582658
pElement->GetCustomData(szName, false, &lastSyncType, &clientChangesMode);
26592659

2660-
const bool changesAllowed = clientChangesMode == ECustomDataClientTrust::UNSET ? !m_pMainConfig->IsElementDataWhitelisted()
2661-
: clientChangesMode == ECustomDataClientTrust::ALLOW;
2660+
const bool changesAllowed = clientChangesMode == eCustomDataClientTrust::UNSET ? !m_pMainConfig->IsElementDataWhitelisted()
2661+
: clientChangesMode == eCustomDataClientTrust::ALLOW;
26622662
if (!changesAllowed)
26632663
{
26642664
CLogger::ErrorPrintf("Client trying to change protected element data %s (%s)", Packet.GetSourcePlayer()->GetNick(),

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class CStaticFunctionDefinitions
8484
static bool ClearElementVisibleTo(CElement* pElement);
8585
static bool SetElementID(CElement* pElement, const char* szID);
8686
static bool SetElementData(CElement* pElement, const char* szName, const CLuaArgument& Variable, ESyncType syncType,
87-
std::optional<ECustomDataClientTrust> clientTrust);
87+
std::optional<eCustomDataClientTrust> clientTrust);
8888
static bool RemoveElementData(CElement* pElement, const char* szName);
8989
static bool AddElementDataSubscriber(CElement* pElement, const char* szName, CPlayer* pPlayer);
9090
static bool RemoveElementDataSubscriber(CElement* pElement, const char* szName, CPlayer* pPlayer);

Server/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,10 @@ ADD_ENUM(ESyncType::LOCAL, "local")
285285
ADD_ENUM(ESyncType::SUBSCRIBE, "subscribe")
286286
IMPLEMENT_ENUM_CLASS_END("sync-mode")
287287

288-
IMPLEMENT_ENUM_CLASS_BEGIN(ECustomDataClientTrust)
289-
ADD_ENUM(ECustomDataClientTrust::UNSET, "default")
290-
ADD_ENUM(ECustomDataClientTrust::ALLOW, "allow")
291-
ADD_ENUM(ECustomDataClientTrust::DENY, "deny")
288+
IMPLEMENT_ENUM_CLASS_BEGIN(eCustomDataClientTrust)
289+
ADD_ENUM(eCustomDataClientTrust::UNSET, "default")
290+
ADD_ENUM(eCustomDataClientTrust::ALLOW, "allow")
291+
ADD_ENUM(eCustomDataClientTrust::DENY, "deny")
292292
IMPLEMENT_ENUM_CLASS_END("client-trust-mode")
293293

294294
//

0 commit comments

Comments
 (0)