swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-11 21:44:58 -04:00
Code Issues Projects Releases Wiki Activity

this is a more "clean" conversion to 64 bit than the type-fixups branch, which does borrow some elements from it but has far less find and replace...it is about 98-99% done, notes to follow later

Browse Source
This commit is contained in:
DarthArgus
2017-01-24 03:35:59 +00:00
parent 42b949c3dc
commit 36686348e9
458 changed files with 2282 additions and 2367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/ConnectionServer/src/shared/CentralConnection.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
//-----------------------------------------------------------------------
CentralConnection::CentralConnection(const std::string & address, const unsigned short port) :
CentralConnection::CentralConnection(const std::string & address, const uint16_t port) :
ServerConnection(address, port, NetworkSetupData())
{
}
engine/server/application/ConnectionServer/src/shared/CentralConnection.h
+1 -1
View File
@@ -14,7 +14,7 @@
class CentralConnection : public ServerConnection
{
public:
CentralConnection (const std::string & address, const unsigned short port);
CentralConnection (const std::string & address, const uint16_t port);
CentralConnection(UdpConnectionMT *, TcpClient *);
~CentralConnection();
void onConnectionClosed();
engine/server/application/ConnectionServer/src/shared/Client.cpp
+1 -1
View File
@@ -163,7 +163,7 @@ void Client::receiveMessage(const MessageDispatch::Emitter & source, const Messa
if(messageType == constcrc("GameConnectionClosed"))
{
// Game server has crashed. With luck, we'll get transferred to a new server shortly
// Game server has crashed. With luck, we'll get transferred to a new server int16_tly
// So, clear our connection and put us on a queue. If we don't get transferred in a
// reasonable about of time, we'll be dropped.
engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp
+2 -2
View File
@@ -925,7 +925,7 @@ void ClientConnection::onReceive(const Archive::ByteStream &message) {
default : {
//Forward on to Game Server
DEBUG_REPORT_LOG((!m_client ||
!m_client->getGameConnection()), ("Warn, received game message with no game connection. This may happen for a short time after a GameServer crashes. If it continues to happen, it indicates a bug.\n"));
!m_client->getGameConnection()), ("Warn, received game message with no game connection. This may happen for a int16_t time after a GameServer crashes. If it continues to happen, it indicates a bug.\n"));
if (m_client && m_client->getGameConnection()) {
static std::vector <NetworkId> v;
@@ -992,7 +992,7 @@ void ClientConnection::onReceive(const Archive::ByteStream &message) {
Unicode::String biography(clientCreate.getBiography());
if (biography.length() > 1024) {
IGNORE_RETURN(biography.erase(1024));
DEBUG_REPORT_LOG(true, ("Biography shortened to 1024 characters.\n"));
DEBUG_REPORT_LOG(true, ("Biography int16_tened to 1024 characters.\n"));
}
if (m_isAdminAccount) {
engine/server/application/ConnectionServer/src/shared/GameConnection.cpp
+1 -1
View File
@@ -35,7 +35,7 @@
//-----------------------------------------------------------------------
GameConnection::GameConnection(const std::string & a, const unsigned short p) :
GameConnection::GameConnection(const std::string & a, const uint16_t p) :
ServerConnection(a, p, NetworkSetupData()),
gameServerId(0),
sceneName()
engine/server/application/ConnectionServer/src/shared/GameConnection.h
+1 -1
View File
@@ -16,7 +16,7 @@ class GameCommandChannel;
class GameConnection : public ServerConnection
{
public:
GameConnection(const std::string & remoteAddress, const unsigned short port);
GameConnection(const std::string & remoteAddress, const uint16_t port);
GameConnection(UdpConnectionMT *, TcpClient *);
virtual ~GameConnection();