- bugfixes for custom port# configurations
- changed version to alpha2
This commit is contained in:
parent
ab5369a090
commit
258cd1fea1
|
@ -26,7 +26,7 @@ using namespace Shared::Platform;
|
||||||
namespace Glest{ namespace Game{
|
namespace Glest{ namespace Game{
|
||||||
|
|
||||||
const string mailString= "contact_game@glest.org";
|
const string mailString= "contact_game@glest.org";
|
||||||
const string glestVersionString= "v3.3.5-dev";
|
const string glestVersionString= "v3.3.5-alpha2";
|
||||||
|
|
||||||
string getCrashDumpFileName(){
|
string getCrashDumpFileName(){
|
||||||
return "glest" + glestVersionString + ".dmp";
|
return "glest" + glestVersionString + ".dmp";
|
||||||
|
|
|
@ -504,7 +504,7 @@ void MenuStateJoinGame::connectToServer()
|
||||||
Config& config= Config::getInstance();
|
Config& config= Config::getInstance();
|
||||||
Ip serverIp(labelServerIp.getText());
|
Ip serverIp(labelServerIp.getText());
|
||||||
|
|
||||||
clientInterface->connect(serverIp, GameConstants::serverPort);
|
clientInterface->connect(serverIp, Config::getInstance().getInt("ServerPort",intToStr(GameConstants::serverPort).c_str()));
|
||||||
|
|
||||||
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] server - [%s]\n",__FILE__,__FUNCTION__,serverIp.getString().c_str());
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] server - [%s]\n",__FILE__,__FUNCTION__,serverIp.getString().c_str());
|
||||||
|
|
||||||
|
|
|
@ -368,8 +368,9 @@ void MenuStateMasterserver::connectToServer(string ipString)
|
||||||
Config& config= Config::getInstance();
|
Config& config= Config::getInstance();
|
||||||
Ip serverIp(ipString);
|
Ip serverIp(ipString);
|
||||||
|
|
||||||
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] try to connect to [%s]\n",__FILE__,__FUNCTION__,serverIp.getString().c_str());
|
int serverPort = Config::getInstance().getInt("ServerPort",intToStr(GameConstants::serverPort).c_str());
|
||||||
clientInterface->connect(serverIp, GameConstants::serverPort);
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] try to connect to [%s] serverPort = %d\n",__FILE__,__FUNCTION__,serverIp.getString().c_str(),serverPort);
|
||||||
|
clientInterface->connect(serverIp, serverPort);
|
||||||
if(!clientInterface->isConnected())
|
if(!clientInterface->isConnected())
|
||||||
{
|
{
|
||||||
NetworkManager::getInstance().end();
|
NetworkManager::getInstance().end();
|
||||||
|
|
|
@ -297,7 +297,7 @@ void ConnectionSlot::update(bool checkForNewClients) {
|
||||||
FileTransferInfo fileInfo;
|
FileTransferInfo fileInfo;
|
||||||
fileInfo.hostType = eServer;
|
fileInfo.hostType = eServer;
|
||||||
//fileInfo.serverIP = this->ip.getString();
|
//fileInfo.serverIP = this->ip.getString();
|
||||||
fileInfo.serverPort = GameConstants::serverPort;
|
fileInfo.serverPort = Config::getInstance().getInt("ServerPort",intToStr(GameConstants::serverPort).c_str());
|
||||||
fileInfo.fileName = networkMessageSynchNetworkGameDataFileGet.getFileName();
|
fileInfo.fileName = networkMessageSynchNetworkGameDataFileGet.getFileName();
|
||||||
|
|
||||||
FileTransferSocketThread *fileXferThread = new FileTransferSocketThread(fileInfo);
|
FileTransferSocketThread *fileXferThread = new FileTransferSocketThread(fileInfo);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user