stellabellum/src
1
0
Fork 0
mirror of https://bitbucket.org/stellabellumswg/src.git synced 2026-01-17 00:05:21 -05:00
Code Issues Projects Releases Wiki Activity

use larger sized ints so that oracle doesn't crap the bed

Browse Source
This commit is contained in:
DarthArgus
2018-05-11 06:26:48 +00:00
parent bea26d2dec
commit 38bddb0d82
5 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h
View File

@@ -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::BindableLong character_create_time;
DB::BindableLong character_last_login_time;
DB::BindableInt64 character_create_time;
DB::BindableInt64 character_last_login_time;
};
class CharacterNameQuery : public DB::Query
@@ -67,8 +67,8 @@ class CharacterNameLocator : public ObjectLocator
std::vector<StationId> m_stationIds;
std::vector<std::string> m_characterNames;
std::vector<std::string> m_characterFullNames;
std::vector<int> m_characterCreateTime;
std::vector<int> m_characterLastLoginTime;
std::vector<int64> m_characterCreateTime;
std::vector<int64> m_characterLastLoginTime;
};
// ======================================================================

26
engine/server/library/serverGame/src/shared/core/NameManager.cpp
View File

@@ -224,15 +224,15 @@ void NameManager::addPlayer(const NetworkId &id, StationId stationId, const std:
std::vector<StationId> stationIds;
std::vector<std::string> characterNames;
std::vector<std::string> characterFullNames;
std::vector<int> characterCreateTimes;
std::vector<int> characterLastLoginTimes;
std::vector<int64> characterCreateTimes;
std::vector<int64> characterLastLoginTimes;
ids.push_back(id);
stationIds.push_back(stationId);
characterNames.push_back(normalizedName);
characterFullNames.push_back(fullName);
characterCreateTimes.push_back(static_cast<int>(createTime));
characterLastLoginTimes.push_back(static_cast<int>(lastLoginTime));
characterCreateTimes.push_back(static_cast<int64>(createTime));
characterLastLoginTimes.push_back(static_cast<int64>(lastLoginTime));
ServerMessageForwarding::beginBroadcast();
@@ -316,24 +316,24 @@ const std::string & NameManager::getPlayerFullName(const NetworkId &id) const
// ----------------------------------------------------------------------
int NameManager::getPlayerCreateTime(const NetworkId &id) const
int64 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<int>(i->second.createTime);
return static_cast<int64>(i->second.createTime);
}
// ----------------------------------------------------------------------
int NameManager::getPlayerLastLoginTime(const NetworkId &id) const
int64 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<int>(i->second.lastLoginTime);
return static_cast<int64>(i->second.lastLoginTime);
}
// ----------------------------------------------------------------------
@@ -464,7 +464,7 @@ void NameManager::releasePlayerName(const NetworkId &id)
// ----------------------------------------------------------------------
void NameManager::addPlayers(const std::vector<NetworkId> &ids, const std::vector<StationId> &stationIds, const std::vector<std::string> &names, const std::vector<std::string> &fullNames, const std::vector<int> &createTimes, const std::vector<int> &lastLoginTimes)
void NameManager::addPlayers(const std::vector<NetworkId> &ids, const std::vector<StationId> &stationIds, const std::vector<std::string> &names, const std::vector<std::string> &fullNames, const std::vector<int64> &createTimes, const std::vector<int64> &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<uint32> const & servers) con
std::vector<StationId> stationIds;
std::vector<std::string> characterNames;
std::vector<std::string> characterFullNames;
std::vector<int> characterCreateTimes;
std::vector<int> characterLastLoginTimes;
std::vector<int64> characterCreateTimes;
std::vector<int64> characterLastLoginTimes;
for (IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->begin(); i!=m_idToCharacterDataMap->end(); ++i)
{
@@ -495,8 +495,8 @@ void NameManager::sendAllNamesToServer (std::vector<uint32> 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<int>(i->second.createTime));
characterLastLoginTimes.push_back(static_cast<int>(i->second.lastLoginTime));
characterCreateTimes.push_back(static_cast<int64>(i->second.createTime));
characterLastLoginTimes.push_back(static_cast<int64>(i->second.lastLoginTime));
}
ServerMessageForwarding::begin(servers);

6
engine/server/library/serverGame/src/shared/core/NameManager.h
View File

@@ -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<NetworkId> &ids, const std::vector<StationId> &stationIds, const std::vector<std::string> &names, const std::vector<std::string> &fullNames, const std::vector<int> &createTimes, const std::vector<int> &lastLoginTimes);
void addPlayers (const std::vector<NetworkId> &ids, const std::vector<StationId> &stationIds, const std::vector<std::string> &names, const std::vector<std::string> &fullNames, const std::vector<int64> &createTimes, const std::vector<int64> &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;
int getPlayerCreateTime (const NetworkId &id) const;
int getPlayerLastLoginTime (const NetworkId &id) const;
int64 getPlayerCreateTime (const NetworkId &id) const;
int64 getPlayerLastLoginTime (const NetworkId &id) const;
void getPlayerWithLastLoginTimeAfter (time_t time, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const;
void getPlayerWithLastLoginTimeBefore (time_t time, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const;
void getPlayerWithLastLoginTimeBetween (time_t timeLowerRange, time_t timeUpperRange, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const;

2
engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp
View File

@@ -10,7 +10,7 @@
// ======================================================================
CharacterNamesMessage::CharacterNamesMessage(const std::vector<NetworkId> &ids, const std::vector<StationId> &stationIds, const std::vector<std::string> &characterNames, const std::vector<std::string> &characterFullNames, const std::vector<int> &createTimes, const std::vector<int> &loginTimes) :
CharacterNamesMessage::CharacterNamesMessage(const std::vector<NetworkId> &ids, const std::vector<StationId> &stationIds, const std::vector<std::string> &characterNames, const std::vector<std::string> &characterFullNames, const std::vector<int64> &createTimes, const std::vector<int64> &loginTimes) :
GameNetworkMessage("CharacterNamesMessage"),
m_ids(),
m_stationIds(),

14
engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h
View File

@@ -22,7 +22,7 @@
class CharacterNamesMessage : public GameNetworkMessage
{
public:
CharacterNamesMessage(const std::vector<NetworkId> &ids, const std::vector<StationId> &stationIds, const std::vector<std::string> &characterNames, const std::vector<std::string> &characterFullNames, const std::vector<int> &createTimes, const std::vector<int> &loginTimes);
CharacterNamesMessage(const std::vector<NetworkId> &ids, const std::vector<StationId> &stationIds, const std::vector<std::string> &characterNames, const std::vector<std::string> &characterFullNames, const std::vector<int64> &createTimes, const std::vector<int64> &loginTimes);
CharacterNamesMessage(Archive::ReadIterator & source);
~CharacterNamesMessage();
@@ -30,16 +30,16 @@ class CharacterNamesMessage : public GameNetworkMessage
const std::vector<StationId> &getStationIds() const;
const std::vector<std::string> &getNames() const;
const std::vector<std::string> &getFullNames() const;
const std::vector<int> &getCreateTimes() const;
const std::vector<int> &getLoginTimes() const;
const std::vector<int64> &getCreateTimes() const;
const std::vector<int64> &getLoginTimes() const;
private:
Archive::AutoArray<NetworkId> m_ids;
Archive::AutoArray<StationId> m_stationIds;
Archive::AutoArray<std::string> m_names;
Archive::AutoArray<std::string> m_fullNames;
Archive::AutoArray<int> m_createTimes;
Archive::AutoArray<int> m_loginTimes;
Archive::AutoArray<int64> m_createTimes;
Archive::AutoArray<int64> m_loginTimes;
private:
//disabled functions:
@@ -79,14 +79,14 @@ inline const std::vector<std::string> & CharacterNamesMessage::getFullNames() co
// ----------------------------------------------------------------------
inline const std::vector<int> & CharacterNamesMessage::getCreateTimes() const
inline const std::vector<int64> & CharacterNamesMessage::getCreateTimes() const
{
return m_createTimes.get();
}
// ----------------------------------------------------------------------
inline const std::vector<int> & CharacterNamesMessage::getLoginTimes() const
inline const std::vector<int64> & CharacterNamesMessage::getLoginTimes() const
{
return m_loginTimes.get();
}