From 1f36461dc5caf691b48a7622a6883261333a11b2 Mon Sep 17 00:00:00 2001 From: Cekis Date: Tue, 1 Feb 2022 23:08:16 -0500 Subject: [PATCH] Fixed issues found in my own review. --- .../src/shared/command/CommandCppFuncs.cpp | 2 +- .../serverGame/src/shared/core/GameServer.cpp | 1 - .../serverGame/src/shared/core/GameServer.h | 2 +- .../src/shared/object/PlayerObject.cpp | 24 +++++++++---------- .../src/shared/object/PlayerObject.h | 4 ++-- .../GameConnectionServerMessages.cpp | 2 +- .../GameConnectionServerMessages.h | 8 +++---- .../src/shared/ServerConnection.cpp | 2 +- .../src/shared/ServerConnection.h | 16 ++++++------- .../src/shared/SystemAssignedProcessId.cpp | 4 ++-- .../src/shared/SystemAssignedProcessId.h | 4 ++-- .../library/sharedFile/src/shared/Iff.cpp | 2 +- .../src/shared/CrcStringTable.cpp | 18 -------------- .../sharedFoundation/src/shared/Misc.h | 2 +- .../src/shared/core/TextManager.cpp | 4 ++-- .../src/shared/PathSearch.cpp | 2 +- .../src/shared/LocalizedStringTable.h | 2 +- .../src/shared/StringIdArchive.cpp | 2 +- .../cleanup/TaskObjectTemplateListUpdater.cpp | 2 +- 19 files changed, 42 insertions(+), 61 deletions(-) diff --git a/engine/server/library/serverGame/src/shared/command/CommandCppFuncs.cpp b/engine/server/library/serverGame/src/shared/command/CommandCppFuncs.cpp index 333d1a2a..d3297c87 100755 --- a/engine/server/library/serverGame/src/shared/command/CommandCppFuncs.cpp +++ b/engine/server/library/serverGame/src/shared/command/CommandCppFuncs.cpp @@ -1804,7 +1804,7 @@ static void commandFuncSpatialChatInternal(Command const &, NetworkId const &act const int32_t chatSpamTimeEndInterval = playerObject->getChatSpamTimeEndInterval(); if ((chatSpamTimeEndInterval > timeNow) && (timeNow >= playerObject->getChatSpamNextTimeToNotifyPlayerWhenLimited())) { - GenericValueTypeMessage csl("ChatSpamLimited", (chatSpamTimeEndInterval - timeNow)); + GenericValueTypeMessage csl("ChatSpamLimited", (chatSpamTimeEndInterval - timeNow)); obj->getClient()->send(csl, true); playerObject->setChatSpamNextTimeToNotifyPlayerWhenLimited((timeNow + ConfigServerGame::getChatSpamNotifyPlayerWhenLimitedIntervalSeconds())); diff --git a/engine/server/library/serverGame/src/shared/core/GameServer.cpp b/engine/server/library/serverGame/src/shared/core/GameServer.cpp index e1e7b75a..456a20d5 100755 --- a/engine/server/library/serverGame/src/shared/core/GameServer.cpp +++ b/engine/server/library/serverGame/src/shared/core/GameServer.cpp @@ -233,7 +233,6 @@ #include "sharedFoundation/CrcConstexpr.hpp" #include -#include //----------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/core/GameServer.h b/engine/server/library/serverGame/src/shared/core/GameServer.h index 0e229b3b..85755bd4 100755 --- a/engine/server/library/serverGame/src/shared/core/GameServer.h +++ b/engine/server/library/serverGame/src/shared/core/GameServer.h @@ -230,7 +230,7 @@ private: bool m_gameServerReadyObjectIds; bool m_gameServerReadyDatabaseConnected; bool m_gameServerReadyPlanetConnected; - uint64_t m_connectionTimeout; + uint32_t m_connectionTimeout; ChatServerConnection * m_chatServerConnection; }; diff --git a/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp b/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp index 8a098bf0..f429e552 100755 --- a/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp @@ -6115,7 +6115,7 @@ void PlayerObject::getByteStreamFromAutoVariable(const std::string & name, Archi { if(name == "quests") { - Archive::AutoDeltaMap(m_quests).pack(target); + Archive::AutoDeltaMap(m_quests).pack(target); } else if(name == "completedQuests") { @@ -6202,11 +6202,11 @@ void PlayerObject::setAutoVariableFromByteStream(const std::string & name, const Archive::ReadIterator ri(source); if(name == "quests") { - typedef Archive::AutoDeltaMap::Command Commands; + typedef Archive::AutoDeltaMap::Command Commands; std::vector quests; m_quests.clear(); - Archive::AutoDeltaMap(m_quests).unpack(ri, quests); + Archive::AutoDeltaMap(m_quests).unpack(ri, quests); for (std::vector::const_iterator questIter = quests.begin(); questIter != quests.end(); ++questIter) { @@ -6337,14 +6337,14 @@ void PlayerObject::setPlayedTimeAccumOnly(float playedTimeAccum) // ---------------------------------------------------------------------- -uint32_t PlayerObject::getSessionPlayTimeDuration() const +int32_t PlayerObject::getSessionPlayTimeDuration() const { - uint32_t const sessionStartPlayTime = static_cast(m_sessionStartPlayTime.get()); + int32_t const sessionStartPlayTime = m_sessionStartPlayTime.get(); if (sessionStartPlayTime > 0) { - uint32_t const now = ::time(nullptr); + int32_t const now = ::time(nullptr); if (now > sessionStartPlayTime) - return static_cast(now - sessionStartPlayTime); + return (now - sessionStartPlayTime); } return 0; @@ -6352,16 +6352,16 @@ uint32_t PlayerObject::getSessionPlayTimeDuration() const // ---------------------------------------------------------------------- -uint32_t PlayerObject::getSessionActivePlayTimeDuration() const +int32_t PlayerObject::getSessionActivePlayTimeDuration() const { - uint32_t activePlayTimeDuration = m_sessionActivePlayTimeDuration.get(); + int32_t activePlayTimeDuration = m_sessionActivePlayTimeDuration.get(); - uint32_t const sessionLastActiveTime = static_cast(m_sessionLastActiveTime.get()); + int32_t const sessionLastActiveTime = m_sessionLastActiveTime.get(); if (sessionLastActiveTime > 0) { - uint32_t const now = ::time(nullptr); + int32_t const now = ::time(nullptr); if (now > sessionLastActiveTime) - activePlayTimeDuration += static_cast(now - sessionLastActiveTime); + activePlayTimeDuration += (now - sessionLastActiveTime); } return activePlayTimeDuration; diff --git a/engine/server/library/serverGame/src/shared/object/PlayerObject.h b/engine/server/library/serverGame/src/shared/object/PlayerObject.h index 0d669f93..598cdc3b 100755 --- a/engine/server/library/serverGame/src/shared/object/PlayerObject.h +++ b/engine/server/library/serverGame/src/shared/object/PlayerObject.h @@ -105,8 +105,8 @@ public: float getPlayedTimeAccumOnly() const; void setPlayedTimeAccumOnly(float playedTimeAccum); - uint32_t getSessionPlayTimeDuration() const; - uint32_t getSessionActivePlayTimeDuration() const; + int32_t getSessionPlayTimeDuration() const; + int32_t getSessionActivePlayTimeDuration() const; int32 getSessionStartPlayTime() const; int32 getSessionLastActiveTime() const; void setSessionPlayTimeInfo(int32 sessionStartPlayTime, int32 sessionLastActiveTime, uint32_t sessionActivePlayTimeDuration); diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/GameConnectionServerMessages.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/GameConnectionServerMessages.cpp index 40b0e0c1..8f9ebede 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/GameConnectionServerMessages.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/GameConnectionServerMessages.cpp @@ -86,7 +86,7 @@ TransferControlMessage::~TransferControlMessage() //----------------------------------------------------------------------- ControlAssumed::ControlAssumed(NetworkId oid, const std::string & newSceneName, const bool skipLoadScreen, const Vector &startPos, const float startYaw, const std::string & templateName, - const int32_t t) : + const int64_t t) : GameNetworkMessage("ControlAssumed"), m_oid(oid), m_sceneName(newSceneName), diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/GameConnectionServerMessages.h b/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/GameConnectionServerMessages.h index a80edad4..9eddc313 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/GameConnectionServerMessages.h +++ b/engine/server/library/serverNetworkMessages/src/shared/gameConnectionServer/GameConnectionServerMessages.h @@ -118,7 +118,7 @@ class ControlAssumed : public GameNetworkMessage public: explicit ControlAssumed(NetworkId oid, const std::string & newSceneName, const bool skipLoadScreen, const Vector &startPos, const float startYaw, const std::string & templateName, - const int32_t timeSeconds); + const int64_t timeSeconds); ControlAssumed(Archive::ReadIterator & source); virtual ~ControlAssumed(); @@ -128,7 +128,7 @@ class ControlAssumed : public GameNetworkMessage const Vector & getStartPosition () const; const float getStartYaw () const; const std::string & getTemplateName () const; - const int32_t getTimeSeconds () const; + const int64_t getTimeSeconds () const; private: Archive::AutoVariable m_oid; @@ -137,7 +137,7 @@ class ControlAssumed : public GameNetworkMessage Archive::AutoVariable m_startPosition; Archive::AutoVariable m_startYaw; Archive::AutoVariable m_templateName; - Archive::AutoVariable m_timeSeconds; + Archive::AutoVariable m_timeSeconds; ControlAssumed(); @@ -188,7 +188,7 @@ inline const std::string & ControlAssumed::getTemplateName() const //----------------------------------------------------------------------- -inline const int32_t ControlAssumed::getTimeSeconds() const +inline const int64_t ControlAssumed::getTimeSeconds() const { return m_timeSeconds.get(); } diff --git a/engine/server/library/serverUtility/src/shared/ServerConnection.cpp b/engine/server/library/serverUtility/src/shared/ServerConnection.cpp index 2ea7eeb0..8b3f3fd7 100755 --- a/engine/server/library/serverUtility/src/shared/ServerConnection.cpp +++ b/engine/server/library/serverUtility/src/shared/ServerConnection.cpp @@ -290,7 +290,7 @@ void ServerConnection::onConnectionStalled(const unsigned long stallTimeMs) // ---------------------------------------------------------------------- -void ServerConnection::setProcessId(const uint32 newProcessId) +void ServerConnection::setProcessId(const uint32_t newProcessId) { processId = newProcessId; } diff --git a/engine/server/library/serverUtility/src/shared/ServerConnection.h b/engine/server/library/serverUtility/src/shared/ServerConnection.h index e53b23d6..adc14b1d 100755 --- a/engine/server/library/serverUtility/src/shared/ServerConnection.h +++ b/engine/server/library/serverUtility/src/shared/ServerConnection.h @@ -31,8 +31,8 @@ public: static const unsigned long makeProcessId (); static bool isMessageForwardable (unsigned long int type); - const unsigned long getProcessId () const; - const unsigned long getOsProcessId () const; + const uint32_t getProcessId () const; + const uint32_t getOsProcessId () const; virtual void onConnectionClosed (); virtual void onConnectionOpened (); virtual void onConnectionOverflowing (const unsigned int bytesPending); @@ -40,8 +40,8 @@ public: virtual void onReceive (const Archive::ByteStream & message); virtual void reportReceive (const Archive::ByteStream & bs); virtual void reportSend (const Archive::ByteStream & bs); - virtual void send (const GameNetworkMessage & message, const bool reliable); - virtual void setProcessId (const uint32 newProcessId); + virtual void send (const GameNetworkMessage & message, const bool reliable); + virtual void setProcessId (const uint32_t newProcessId); public: class MessageConnectionCallback: public MessageDispatch::MessageBase @@ -67,20 +67,20 @@ private: ServerConnection &operator=(const ServerConnection&); //disable private: - unsigned long processId; - unsigned long osProcessId; // remote's operating system assigned PID + uint32_t processId; + uint32_t osProcessId; // remote's operating system assigned PID }; //----------------------------------------------------------------------- -inline const unsigned long ServerConnection::getProcessId(void) const +inline const uint32_t ServerConnection::getProcessId(void) const { return processId; } //----------------------------------------------------------------------- -inline const unsigned long ServerConnection::getOsProcessId() const +inline const uint32_t ServerConnection::getOsProcessId() const { return osProcessId; } diff --git a/engine/server/library/serverUtility/src/shared/SystemAssignedProcessId.cpp b/engine/server/library/serverUtility/src/shared/SystemAssignedProcessId.cpp index 3ad1949b..c22ce195 100755 --- a/engine/server/library/serverUtility/src/shared/SystemAssignedProcessId.cpp +++ b/engine/server/library/serverUtility/src/shared/SystemAssignedProcessId.cpp @@ -9,7 +9,7 @@ //----------------------------------------------------------------------- -SystemAssignedProcessId::SystemAssignedProcessId(const unsigned long id) : +SystemAssignedProcessId::SystemAssignedProcessId(const uint32_t id) : GameNetworkMessage("SystemAssignedProcessId"), m_id(id) { @@ -34,7 +34,7 @@ SystemAssignedProcessId::~SystemAssignedProcessId() //----------------------------------------------------------------------- -const unsigned long SystemAssignedProcessId::getId() const +const uint32_t SystemAssignedProcessId::getId() const { return m_id.get(); } diff --git a/engine/server/library/serverUtility/src/shared/SystemAssignedProcessId.h b/engine/server/library/serverUtility/src/shared/SystemAssignedProcessId.h index 63047124..3d27bb25 100755 --- a/engine/server/library/serverUtility/src/shared/SystemAssignedProcessId.h +++ b/engine/server/library/serverUtility/src/shared/SystemAssignedProcessId.h @@ -14,11 +14,11 @@ class SystemAssignedProcessId : public GameNetworkMessage { public: - explicit SystemAssignedProcessId(const unsigned long id); + explicit SystemAssignedProcessId(const uint32_t id); explicit SystemAssignedProcessId(Archive::ReadIterator & source); ~SystemAssignedProcessId(); - const unsigned long getId () const; + const uint32_t getId () const; private: SystemAssignedProcessId & operator = (const SystemAssignedProcessId & rhs); diff --git a/engine/shared/library/sharedFile/src/shared/Iff.cpp b/engine/shared/library/sharedFile/src/shared/Iff.cpp index 5eb06ec7..36e34d15 100755 --- a/engine/shared/library/sharedFile/src/shared/Iff.cpp +++ b/engine/shared/library/sharedFile/src/shared/Iff.cpp @@ -744,7 +744,7 @@ void Iff::insertForm(Tag name, bool shouldEnterForm) void Iff::insertChunk(Tag name, bool shouldEnterChunk) { - const int32 CHUNK_OVERHEAD = sizeof(Tag) + sizeof(uint32); + const int32_t CHUNK_OVERHEAD = sizeof(Tag) + sizeof(uint32); Tag t; int32 offset; diff --git a/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.cpp b/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.cpp index 6c962b3f..ab00efba 100755 --- a/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/CrcStringTable.cpp @@ -14,7 +14,6 @@ #include "sharedFoundation/ConstCharCrcString.h" #include -#include // ====================================================================== @@ -165,23 +164,6 @@ ConstCharCrcString const CrcStringTable::lookUp(uint32 crc) const high = mid - 1; } - low = 0; - high = m_numberOfEntries - 1; - - while (low <= high) - { - int const mid = (low + high) / 2; - uint32 const entry = m_crcTable[mid]; - - if (crc == entry) - return ConstCharCrcString(m_strings + m_stringsOffsetTable[mid], crc); - else - if (crc > entry) - low = mid + 1; - else - high = mid - 1; - } - return ConstCharCrcString("", 0); } diff --git a/engine/shared/library/sharedFoundation/src/shared/Misc.h b/engine/shared/library/sharedFoundation/src/shared/Misc.h index d0e70c94..d8a02adb 100755 --- a/engine/shared/library/sharedFoundation/src/shared/Misc.h +++ b/engine/shared/library/sharedFoundation/src/shared/Misc.h @@ -230,7 +230,7 @@ inline void *memmove(void *destination, const void *source, int length) { DEBUG_FATAL(!destination, ("nullptr destination arg")); DEBUG_FATAL(!source, ("nullptr source arg")); - return memmove(destination, source, static_cast(length)); + return memmove(destination, source, length); } // ---------------------------------------------------------------------- diff --git a/engine/shared/library/sharedGame/src/shared/core/TextManager.cpp b/engine/shared/library/sharedGame/src/shared/core/TextManager.cpp index 599ee57c..eb86ffce 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)); - size_t findStartPosition = 0; + uint32_t findStartPosition = 0; for (;;) { @@ -137,7 +137,7 @@ void TextManagerNamespace::getAppropriateWord(Unicode::String &text) continue; } - size_t index = lowerText.find(cussWord, findStartPosition); + uint32_t index = lowerText.find(cussWord, findStartPosition); if (index != Unicode::String::npos) { diff --git a/engine/shared/library/sharedPathfinding/src/shared/PathSearch.cpp b/engine/shared/library/sharedPathfinding/src/shared/PathSearch.cpp index f708a315..3713625c 100755 --- a/engine/shared/library/sharedPathfinding/src/shared/PathSearch.cpp +++ b/engine/shared/library/sharedPathfinding/src/shared/PathSearch.cpp @@ -193,7 +193,7 @@ PathSearchNode * PathSearchNode::createSearchNode( PathNode const * node ) PathSearchNode * searchNode = new PathSearchNode(m_search,m_graph,node); - node->setMark( 3, (int64)((void*)searchNode) ); + node->setMark( 3, (int64_t)((void*)searchNode) ); m_search->m_visitedNodes->push_back(node); diff --git a/external/ours/library/localization/src/shared/LocalizedStringTable.h b/external/ours/library/localization/src/shared/LocalizedStringTable.h index dfcc3d2b..36ad1aab 100755 --- a/external/ours/library/localization/src/shared/LocalizedStringTable.h +++ b/external/ours/library/localization/src/shared/LocalizedStringTable.h @@ -46,7 +46,7 @@ public: typedef std::map NameMap_t; // TODO: make this typedef platform dependent - typedef uint32_t magic_type; + typedef int32_t magic_type; static const magic_type ms_MAGIC; explicit LocalizedStringTable (const std::string & filename); diff --git a/external/ours/library/localizationArchive/src/shared/StringIdArchive.cpp b/external/ours/library/localizationArchive/src/shared/StringIdArchive.cpp index 028bbfda..889167c5 100755 --- a/external/ours/library/localizationArchive/src/shared/StringIdArchive.cpp +++ b/external/ours/library/localizationArchive/src/shared/StringIdArchive.cpp @@ -23,7 +23,7 @@ namespace Archive */ void get(ReadIterator & source, StringId & target) { - int32_t index = 0; + uint32_t index = 0; std::string table; std::string name; diff --git a/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskObjectTemplateListUpdater.cpp b/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskObjectTemplateListUpdater.cpp index 54b181fe..97c648f7 100755 --- a/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskObjectTemplateListUpdater.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskObjectTemplateListUpdater.cpp @@ -32,7 +32,7 @@ bool TaskObjectTemplateListUpdater::process(DB::Session *session) int i_lines = 0; while(1) { - uint32 i_id; + int32 i_id; char s_name[4096]; int i_retval = 0;