From fc52ba532a54540fbfcef3b59207451e138c12f7 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Thu, 17 May 2018 17:53:30 +0000 Subject: [PATCH] Revert "use larger sized ints so that oracle doesn't crap the bed" This reverts commit ca105492e7af5d7ca7d64725ad45b251e9a8b66f. --- .../src/shared/CharacterNameLocator.h | 8 +++--- .../src/shared/core/NameManager.cpp | 26 +++++++++---------- .../serverGame/src/shared/core/NameManager.h | 6 ++--- .../gameGameServer/CharacterNamesMessage.cpp | 2 +- .../gameGameServer/CharacterNamesMessage.h | 14 +++++----- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h b/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h index 6227b30e..258a1359 100755 --- a/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h +++ b/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h @@ -36,8 +36,8 @@ class CharacterNameLocator : public ObjectLocator DB::BindableInt64 character_station_id; DB::BindableString<127> character_name; DB::BindableString<127> character_full_name; - DB::BindableInt64 character_create_time; - DB::BindableInt64 character_last_login_time; + DB::BindableLong character_create_time; + DB::BindableLong character_last_login_time; }; class CharacterNameQuery : public DB::Query @@ -67,8 +67,8 @@ class CharacterNameLocator : public ObjectLocator std::vector m_stationIds; std::vector m_characterNames; std::vector m_characterFullNames; - std::vector m_characterCreateTime; - std::vector m_characterLastLoginTime; + std::vector m_characterCreateTime; + std::vector m_characterLastLoginTime; }; // ====================================================================== diff --git a/engine/server/library/serverGame/src/shared/core/NameManager.cpp b/engine/server/library/serverGame/src/shared/core/NameManager.cpp index 2ee27216..f5ea7c6d 100755 --- a/engine/server/library/serverGame/src/shared/core/NameManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/NameManager.cpp @@ -224,15 +224,15 @@ void NameManager::addPlayer(const NetworkId &id, StationId stationId, const std: std::vector stationIds; std::vector characterNames; std::vector characterFullNames; - std::vector characterCreateTimes; - std::vector characterLastLoginTimes; + std::vector characterCreateTimes; + std::vector characterLastLoginTimes; ids.push_back(id); stationIds.push_back(stationId); characterNames.push_back(normalizedName); characterFullNames.push_back(fullName); - characterCreateTimes.push_back(static_cast(createTime)); - characterLastLoginTimes.push_back(static_cast(lastLoginTime)); + characterCreateTimes.push_back(static_cast(createTime)); + characterLastLoginTimes.push_back(static_cast(lastLoginTime)); ServerMessageForwarding::beginBroadcast(); @@ -316,24 +316,24 @@ const std::string & NameManager::getPlayerFullName(const NetworkId &id) const // ---------------------------------------------------------------------- -int64 NameManager::getPlayerCreateTime(const NetworkId &id) const +int NameManager::getPlayerCreateTime(const NetworkId &id) const { IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->find(id); if (i==m_idToCharacterDataMap->end()) return -1; else - return static_cast(i->second.createTime); + return static_cast(i->second.createTime); } // ---------------------------------------------------------------------- -int64 NameManager::getPlayerLastLoginTime(const NetworkId &id) const +int NameManager::getPlayerLastLoginTime(const NetworkId &id) const { IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->find(id); if (i==m_idToCharacterDataMap->end()) return -1; else - return static_cast(i->second.lastLoginTime); + return static_cast(i->second.lastLoginTime); } // ---------------------------------------------------------------------- @@ -464,7 +464,7 @@ void NameManager::releasePlayerName(const NetworkId &id) // ---------------------------------------------------------------------- -void NameManager::addPlayers(const std::vector &ids, const std::vector &stationIds, const std::vector &names, const std::vector &fullNames, const std::vector &createTimes, const std::vector &lastLoginTimes) +void NameManager::addPlayers(const std::vector &ids, const std::vector &stationIds, const std::vector &names, const std::vector &fullNames, const std::vector &createTimes, const std::vector &lastLoginTimes) { DEBUG_FATAL(ids.size() != stationIds.size(),("Programmer bug: Vectors ids and stationIds must be the same size.\n")); DEBUG_FATAL(ids.size() != names.size(),("Programmer bug: Vectors ids and names must be the same size.\n")); @@ -486,8 +486,8 @@ void NameManager::sendAllNamesToServer (std::vector const & servers) con std::vector stationIds; std::vector characterNames; std::vector characterFullNames; - std::vector characterCreateTimes; - std::vector characterLastLoginTimes; + std::vector characterCreateTimes; + std::vector characterLastLoginTimes; for (IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->begin(); i!=m_idToCharacterDataMap->end(); ++i) { @@ -495,8 +495,8 @@ void NameManager::sendAllNamesToServer (std::vector const & servers) con stationIds.push_back(i->second.stationId); characterNames.push_back(i->second.characterName); characterFullNames.push_back(i->second.characterFullName); - characterCreateTimes.push_back(static_cast(i->second.createTime)); - characterLastLoginTimes.push_back(static_cast(i->second.lastLoginTime)); + characterCreateTimes.push_back(static_cast(i->second.createTime)); + characterLastLoginTimes.push_back(static_cast(i->second.lastLoginTime)); } ServerMessageForwarding::begin(servers); diff --git a/engine/server/library/serverGame/src/shared/core/NameManager.h b/engine/server/library/serverGame/src/shared/core/NameManager.h index 453ba626..f98940e2 100755 --- a/engine/server/library/serverGame/src/shared/core/NameManager.h +++ b/engine/server/library/serverGame/src/shared/core/NameManager.h @@ -35,7 +35,7 @@ class NameManager public: int getTotalPlayerCount () const; void addPlayer (const NetworkId &id, StationId stationId, const std::string &name, const std::string &fullName, time_t createTime, time_t lastLoginTime, bool notifyOtherServers); - void addPlayers (const std::vector &ids, const std::vector &stationIds, const std::vector &names, const std::vector &fullNames, const std::vector &createTimes, const std::vector &lastLoginTimes); + void addPlayers (const std::vector &ids, const std::vector &stationIds, const std::vector &names, const std::vector &fullNames, const std::vector &createTimes, const std::vector &lastLoginTimes); void renamePlayer (const NetworkId &id, const Unicode::String &name, const Unicode::String &fullName); std::string debugGetNameList () const; bool isPlayer (NetworkId const & possiblePlayer) const; @@ -43,8 +43,8 @@ class NameManager StationId getPlayerStationId (const NetworkId &id) const; const std::string & getPlayerName (const NetworkId &id) const; const std::string & getPlayerFullName (const NetworkId &id) const; - int64 getPlayerCreateTime (const NetworkId &id) const; - int64 getPlayerLastLoginTime (const NetworkId &id) const; + int getPlayerCreateTime (const NetworkId &id) const; + int getPlayerLastLoginTime (const NetworkId &id) const; void getPlayerWithLastLoginTimeAfter (time_t time, std::multimap, std::string> > &result) const; void getPlayerWithLastLoginTimeBefore (time_t time, std::multimap, std::string> > &result) const; void getPlayerWithLastLoginTimeBetween (time_t timeLowerRange, time_t timeUpperRange, std::multimap, std::string> > &result) const; diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp index 3bd27763..8dcb9a94 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp @@ -10,7 +10,7 @@ // ====================================================================== -CharacterNamesMessage::CharacterNamesMessage(const std::vector &ids, const std::vector &stationIds, const std::vector &characterNames, const std::vector &characterFullNames, const std::vector &createTimes, const std::vector &loginTimes) : +CharacterNamesMessage::CharacterNamesMessage(const std::vector &ids, const std::vector &stationIds, const std::vector &characterNames, const std::vector &characterFullNames, const std::vector &createTimes, const std::vector &loginTimes) : GameNetworkMessage("CharacterNamesMessage"), m_ids(), m_stationIds(), diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h index bb1aef7b..047b32d0 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h @@ -22,7 +22,7 @@ class CharacterNamesMessage : public GameNetworkMessage { public: - CharacterNamesMessage(const std::vector &ids, const std::vector &stationIds, const std::vector &characterNames, const std::vector &characterFullNames, const std::vector &createTimes, const std::vector &loginTimes); + CharacterNamesMessage(const std::vector &ids, const std::vector &stationIds, const std::vector &characterNames, const std::vector &characterFullNames, const std::vector &createTimes, const std::vector &loginTimes); CharacterNamesMessage(Archive::ReadIterator & source); ~CharacterNamesMessage(); @@ -30,16 +30,16 @@ class CharacterNamesMessage : public GameNetworkMessage const std::vector &getStationIds() const; const std::vector &getNames() const; const std::vector &getFullNames() const; - const std::vector &getCreateTimes() const; - const std::vector &getLoginTimes() const; + const std::vector &getCreateTimes() const; + const std::vector &getLoginTimes() const; private: Archive::AutoArray m_ids; Archive::AutoArray m_stationIds; Archive::AutoArray m_names; Archive::AutoArray m_fullNames; - Archive::AutoArray m_createTimes; - Archive::AutoArray m_loginTimes; + Archive::AutoArray m_createTimes; + Archive::AutoArray m_loginTimes; private: //disabled functions: @@ -79,14 +79,14 @@ inline const std::vector & CharacterNamesMessage::getFullNames() co // ---------------------------------------------------------------------- -inline const std::vector & CharacterNamesMessage::getCreateTimes() const +inline const std::vector & CharacterNamesMessage::getCreateTimes() const { return m_createTimes.get(); } // ---------------------------------------------------------------------- -inline const std::vector & CharacterNamesMessage::getLoginTimes() const +inline const std::vector & CharacterNamesMessage::getLoginTimes() const { return m_loginTimes.get(); }