From 55d7c6eebcb36136c5a0c38a48319f22c45d16f7 Mon Sep 17 00:00:00 2001 From: Titus Tscharntke Date: Thu, 13 May 2010 00:42:49 +0000 Subject: [PATCH] looks a bit better now --- .../menu/menu_state_custom_game.cpp | 8 ++-- .../menu/menu_state_masterserver.cpp | 37 +++---------------- 2 files changed, 9 insertions(+), 36 deletions(-) diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp index b09223759..18fd69612 100644 --- a/source/glest_game/menu/menu_state_custom_game.cpp +++ b/source/glest_game/menu/menu_state_custom_game.cpp @@ -116,9 +116,9 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, b labelTechTree.init(700, 290); - labelPublishServer.init(350, 90, 100); + labelPublishServer.init(350, 690, 100); labelPublishServer.setText(lang.get("Publish Server")); - listBoxPublishServer.init(350, 60, 100); + listBoxPublishServer.init(350, 660, 100); listBoxPublishServer.pushBackItem(lang.get("Yes")); listBoxPublishServer.pushBackItem(lang.get("No")); listBoxPublishServer.setSelectedItemIndex(1); @@ -607,7 +607,7 @@ void MenuStateCustomGame::update() listBoxPublishServer.setEditable(false); } - if(listBoxPublishServer.getEditable() && listBoxPublishServer.getSelectedItemIndex()==0 && (difftime(time(NULL),lastMasterserverPublishing) >= 5) ){ + if(listBoxPublishServer.getEditable() && listBoxPublishServer.getSelectedItemIndex()==0 && (difftime(time(NULL),lastMasterserverPublishing) >= 15) ){ // give it to me baby, aha aha ... lastMasterserverPublishing = time(NULL); publishToMasterserver(); @@ -676,7 +676,7 @@ void MenuStateCustomGame::publishToMasterserver() } //?status=waiting&system=linux&info=titus serverinfo+="glestVersion="+escapeURL(glestVersionString)+"&"; - serverinfo+="platform=xxx&"; + serverinfo+="platform="+escapeURL(getPlatformNameString())+"&"; serverinfo+="binaryCompileDate="+escapeURL(getCompileDateTime())+"&"; //game info: diff --git a/source/glest_game/menu/menu_state_masterserver.cpp b/source/glest_game/menu/menu_state_masterserver.cpp index dc8ad52ef..a0fc5e532 100644 --- a/source/glest_game/menu/menu_state_masterserver.cpp +++ b/source/glest_game/menu/menu_state_masterserver.cpp @@ -40,7 +40,7 @@ ServerLine::ServerLine( MasterServerInfo *mServerInfo, int lineIndex) index=lineIndex; int lineOffset=25*lineIndex; masterServerInfo=mServerInfo; - int i=50; + int i=10; int startOffset=650; //general info: @@ -55,16 +55,16 @@ ServerLine::ServerLine( MasterServerInfo *mServerInfo, int lineIndex) binaryCompileDateLabel.setText(masterServerInfo->getBinaryCompileDate()); //game info: - i+=70; + i+=130; serverTitleLabel.init(i,startOffset-lineOffset); serverTitleLabel.setText(masterServerInfo->getServerTitle()); - i+=150; + i+=160; ipAddressLabel.init(i,startOffset-lineOffset); ipAddressLabel.setText(masterServerInfo->getIpAddress()); //game setup info: - i+=100; + i+=70; techLabel.init(i,startOffset-lineOffset); techLabel.setText(masterServerInfo->getTech()); @@ -258,34 +258,7 @@ void MenuStateMasterserver::updateServerInfo() { serverLines.push_back(new ServerLine( masterServerInfo, i)); } - } -/* - for(int i=0; i<10;i++){ - MasterServerInfo *masterServerInfo=new MasterServerInfo(); - - - //general info: - masterServerInfo->setGlestVersion("3.3.5-dev"); - masterServerInfo->setPlatform("Linux"); - masterServerInfo->setBinaryCompileDate("11.05.69"); - - //game info: - masterServerInfo->setServerTitle("Titis Server"); - masterServerInfo->setIpAddress("172.20.100.101"); - - //game setup info: - masterServerInfo->setTech("Indian"); - masterServerInfo->setMap("Conflict"); - masterServerInfo->setTileset("Autumn"); - masterServerInfo->setActiveSlots(8); - masterServerInfo->setNetworkSlots(4); - masterServerInfo->setConnectedClients(0); - - - serverLines.push_back(new ServerLine( masterServerInfo, i)); - } -*/ - + } //masterServerInfos.push_back(masterServerInfo); }