From 552af24d0a31db1e4b078a1d7f139da9375dde00 Mon Sep 17 00:00:00 2001 From: Cekis Date: Sat, 5 Feb 2022 15:51:47 -0500 Subject: [PATCH] Adjustments to issues when compiling in 64 bits --- .../LoginServer/src/shared/CSToolConnection.cpp | 8 ++++---- .../application/LoginServer/src/shared/CSToolConnection.h | 6 +++--- .../LoginServer/src/shared/SessionApiClient.cpp | 2 +- .../library/serverDatabase/src/shared/DatabaseProcess.cpp | 5 +++-- .../library/sharedGame/src/shared/core/TextManager.cpp | 8 ++++---- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/engine/server/application/LoginServer/src/shared/CSToolConnection.cpp b/engine/server/application/LoginServer/src/shared/CSToolConnection.cpp index 9163a15a..6460a330 100755 --- a/engine/server/application/LoginServer/src/shared/CSToolConnection.cpp +++ b/engine/server/application/LoginServer/src/shared/CSToolConnection.cpp @@ -21,20 +21,20 @@ namespace CSToolConnectionNamespace { - std::map< uint32, CSToolConnection * > toolsByID; + std::map< uintptr_t, CSToolConnection * > toolsByID; } uint32 CSToolConnection::m_curToolID = 0; // statics -CSToolConnection * CSToolConnection::getCSToolConnectionByToolId(uint32 id) +CSToolConnection * CSToolConnection::getCSToolConnectionByToolId(uintptr_t id) { - std::map< uint32, CSToolConnection * >::iterator it = CSToolConnectionNamespace::toolsByID.find(id); + std::map< uintptr_t, CSToolConnection * >::iterator it = CSToolConnectionNamespace::toolsByID.find(id); return it == CSToolConnectionNamespace::toolsByID.end() ? 0 : it->second; } -void CSToolConnection::validateCSTool(uint32 toolId, apiResult result, const apiSession& session) +void CSToolConnection::validateCSTool(uintptr_t toolId, apiResult result, const apiSession& session) { //find the tool CSToolConnection * p_connection = getCSToolConnectionByToolId(toolId); diff --git a/engine/server/application/LoginServer/src/shared/CSToolConnection.h b/engine/server/application/LoginServer/src/shared/CSToolConnection.h index 08651f09..6690916d 100755 --- a/engine/server/application/LoginServer/src/shared/CSToolConnection.h +++ b/engine/server/application/LoginServer/src/shared/CSToolConnection.h @@ -29,8 +29,8 @@ public: virtual void onConnectionClosed(); void sendToClusters( const std::string & sCommand, const std::string &sCommandLine ); - static CSToolConnection * getCSToolConnectionByToolId( uint32 id ); - static void validateCSTool( uint32 toolId, apiResult result, const apiSession & session ); + static CSToolConnection * getCSToolConnectionByToolId( uintptr_t id ); + static void validateCSTool( uintptr_t toolId, apiResult result, const apiSession & session ); // cluster selection interface std::string selectCluster( const std::string & cluster ); @@ -47,7 +47,7 @@ protected: uint32 m_ui32PrivilegeLevel; std::string m_sInputBuffer; std::string m_sUserName; - uint32 m_toolID; + uintptr_t m_toolID; static uint32 m_curToolID; std::set< std::string > m_selectedClusters; diff --git a/engine/server/application/LoginServer/src/shared/SessionApiClient.cpp b/engine/server/application/LoginServer/src/shared/SessionApiClient.cpp index 5be50c0d..6879a06d 100755 --- a/engine/server/application/LoginServer/src/shared/SessionApiClient.cpp +++ b/engine/server/application/LoginServer/src/shared/SessionApiClient.cpp @@ -120,7 +120,7 @@ void SessionApiClient::OnSessionValidate(const apiTrackingNumber trackingNumber, else { // attempt to validate a CS Tool associated with this request. - CSToolConnection::validateCSTool( ( uint32 ) userData, result, session ); + CSToolConnection::validateCSTool( ( uintptr_t ) userData, result, session ); } } diff --git a/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp b/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp index 69aa99cd..3972a681 100755 --- a/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp +++ b/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp @@ -195,8 +195,9 @@ DatabaseProcess::~DatabaseProcess() void DatabaseProcess::run(void) { static bool shouldSleep = ConfigServerDatabase::getShouldSleep(); - // unused. - // bool idle=false; +#ifdef _DEBUG + bool idle = false; +#endif int loopcount=0; float nextQueryCountTime=0; diff --git a/engine/shared/library/sharedGame/src/shared/core/TextManager.cpp b/engine/shared/library/sharedGame/src/shared/core/TextManager.cpp index eb86ffce..3f522fcd 100755 --- a/engine/shared/library/sharedGame/src/shared/core/TextManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/TextManager.cpp @@ -120,7 +120,7 @@ void TextManagerNamespace::getAppropriateWord(Unicode::String &text) // Sub-string search time for words that are listed for sub-string searches Unicode::String lowerText(Unicode::toLower(text)); - uint32_t findStartPosition = 0; + size_t findStartPosition = 0; for (;;) { @@ -137,7 +137,7 @@ void TextManagerNamespace::getAppropriateWord(Unicode::String &text) continue; } - uint32_t index = lowerText.find(cussWord, findStartPosition); + size_t index = lowerText.find(cussWord, findStartPosition); if (index != Unicode::String::npos) { @@ -145,10 +145,10 @@ void TextManagerNamespace::getAppropriateWord(Unicode::String &text) // Found a bad word, replace the word - unsigned int const letterCount = cussWord.size(); + size_t const letterCount = cussWord.size(); Unicode::String filterLetter; - for (unsigned int i = 0; i < letterCount; ++i) + for (size_t i = 0; i < letterCount; ++i) { getFilterLetter(filterLetter);