Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bugfixes for custom port# configurations 

- changed version to alpha2
This commit is contained in:
Mark Vejvoda 2010-05-17 20:41:18 +00:00
parent ab5369a090
commit 258cd1fea1
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/glest_game/facilities/game_util.cpp
View File

@ -26,7 +26,7 @@ using namespace Shared::Platform;
namespace Glest{ namespace Game{
const string mailString= "contact_game@glest.org";
const string glestVersionString= "v3.3.5-dev";
const string glestVersionString= "v3.3.5-alpha2";
string getCrashDumpFileName(){
return "glest" + glestVersionString + ".dmp";

2
source/glest_game/menu/menu_state_join_game.cpp
View File

@ -504,7 +504,7 @@ void MenuStateJoinGame::connectToServer()
Config& config= Config::getInstance();
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());

5
source/glest_game/menu/menu_state_masterserver.cpp
View File

@ -368,8 +368,9 @@ void MenuStateMasterserver::connectToServer(string ipString)
Config& config= Config::getInstance();
Ip serverIp(ipString);
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] try to connect to [%s]\n",__FILE__,__FUNCTION__,serverIp.getString().c_str());
clientInterface->connect(serverIp, GameConstants::serverPort);
int serverPort = Config::getInstance().getInt("ServerPort",intToStr(GameConstants::serverPort).c_str());
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())
{
NetworkManager::getInstance().end();

2
source/glest_game/network/connection_slot.cpp
View File

@ -297,7 +297,7 @@ void ConnectionSlot::update(bool checkForNewClients) {
FileTransferInfo fileInfo;
fileInfo.hostType = eServer;
//fileInfo.serverIP = this->ip.getString();
fileInfo.serverPort = GameConstants::serverPort;
fileInfo.serverPort = Config::getInstance().getInt("ServerPort",intToStr(GameConstants::serverPort).c_str());
fileInfo.fileName = networkMessageSynchNetworkGameDataFileGet.getFileName();
FileTransferSocketThread *fileXferThread = new FileTransferSocketThread(fileInfo);