looks a bit better now
This commit is contained in:
parent
9fb3352dfe
commit
55d7c6eebc
|
@ -116,9 +116,9 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, b
|
||||||
labelTechTree.init(700, 290);
|
labelTechTree.init(700, 290);
|
||||||
|
|
||||||
|
|
||||||
labelPublishServer.init(350, 90, 100);
|
labelPublishServer.init(350, 690, 100);
|
||||||
labelPublishServer.setText(lang.get("Publish Server"));
|
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("Yes"));
|
||||||
listBoxPublishServer.pushBackItem(lang.get("No"));
|
listBoxPublishServer.pushBackItem(lang.get("No"));
|
||||||
listBoxPublishServer.setSelectedItemIndex(1);
|
listBoxPublishServer.setSelectedItemIndex(1);
|
||||||
|
@ -607,7 +607,7 @@ void MenuStateCustomGame::update()
|
||||||
listBoxPublishServer.setEditable(false);
|
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 ...
|
// give it to me baby, aha aha ...
|
||||||
lastMasterserverPublishing = time(NULL);
|
lastMasterserverPublishing = time(NULL);
|
||||||
publishToMasterserver();
|
publishToMasterserver();
|
||||||
|
@ -676,7 +676,7 @@ void MenuStateCustomGame::publishToMasterserver()
|
||||||
}
|
}
|
||||||
//?status=waiting&system=linux&info=titus
|
//?status=waiting&system=linux&info=titus
|
||||||
serverinfo+="glestVersion="+escapeURL(glestVersionString)+"&";
|
serverinfo+="glestVersion="+escapeURL(glestVersionString)+"&";
|
||||||
serverinfo+="platform=xxx&";
|
serverinfo+="platform="+escapeURL(getPlatformNameString())+"&";
|
||||||
serverinfo+="binaryCompileDate="+escapeURL(getCompileDateTime())+"&";
|
serverinfo+="binaryCompileDate="+escapeURL(getCompileDateTime())+"&";
|
||||||
|
|
||||||
//game info:
|
//game info:
|
||||||
|
|
|
@ -40,7 +40,7 @@ ServerLine::ServerLine( MasterServerInfo *mServerInfo, int lineIndex)
|
||||||
index=lineIndex;
|
index=lineIndex;
|
||||||
int lineOffset=25*lineIndex;
|
int lineOffset=25*lineIndex;
|
||||||
masterServerInfo=mServerInfo;
|
masterServerInfo=mServerInfo;
|
||||||
int i=50;
|
int i=10;
|
||||||
int startOffset=650;
|
int startOffset=650;
|
||||||
|
|
||||||
//general info:
|
//general info:
|
||||||
|
@ -55,16 +55,16 @@ ServerLine::ServerLine( MasterServerInfo *mServerInfo, int lineIndex)
|
||||||
binaryCompileDateLabel.setText(masterServerInfo->getBinaryCompileDate());
|
binaryCompileDateLabel.setText(masterServerInfo->getBinaryCompileDate());
|
||||||
|
|
||||||
//game info:
|
//game info:
|
||||||
i+=70;
|
i+=130;
|
||||||
serverTitleLabel.init(i,startOffset-lineOffset);
|
serverTitleLabel.init(i,startOffset-lineOffset);
|
||||||
serverTitleLabel.setText(masterServerInfo->getServerTitle());
|
serverTitleLabel.setText(masterServerInfo->getServerTitle());
|
||||||
|
|
||||||
i+=150;
|
i+=160;
|
||||||
ipAddressLabel.init(i,startOffset-lineOffset);
|
ipAddressLabel.init(i,startOffset-lineOffset);
|
||||||
ipAddressLabel.setText(masterServerInfo->getIpAddress());
|
ipAddressLabel.setText(masterServerInfo->getIpAddress());
|
||||||
|
|
||||||
//game setup info:
|
//game setup info:
|
||||||
i+=100;
|
i+=70;
|
||||||
techLabel.init(i,startOffset-lineOffset);
|
techLabel.init(i,startOffset-lineOffset);
|
||||||
techLabel.setText(masterServerInfo->getTech());
|
techLabel.setText(masterServerInfo->getTech());
|
||||||
|
|
||||||
|
@ -258,34 +258,7 @@ void MenuStateMasterserver::updateServerInfo() {
|
||||||
|
|
||||||
serverLines.push_back(new ServerLine( masterServerInfo, i));
|
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);
|
//masterServerInfos.push_back(masterServerInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user