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

masterserver menu rearranged ( ip and tileset are not longer shown )

Browse Source
This commit is contained in:
Titus Tscharntke 2011-01-25 21:45:42 +00:00
parent 9c842f1688
commit 66471d8ef4
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,38 +149,34 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
serverTitleLabel.init(i,startOffset-lineOffset);
serverTitleLabel.setText(lang.get("MGGameTitle"));
i+=80;
i+=140;
countryLabel.registerGraphicComponent(containerName,"countryLabel");
countryLabel.init(i,startOffset-lineOffset);
countryLabel.setText(lang.get("MGGameCountry"));
i+=80;
statusLabel.registerGraphicComponent(containerName,"statusLabel");
statusLabel.init(i,startOffset-lineOffset);
statusLabel.setText(lang.get("MGGameStatus"));
i+=90;
ipAddressLabel.registerGraphicComponent(containerName,"ipAddressLabel");
ipAddressLabel.init(i,startOffset-lineOffset);
ipAddressLabel.setText(lang.get("MGGameIP"));
// ipAddressLabel.registerGraphicComponent(containerName,"ipAddressLabel");
// ipAddressLabel.init(i,startOffset-lineOffset);
// ipAddressLabel.setText(lang.get("MGGameIP"));
// i+=100;
//game setup info:
i+=100;
techLabel.registerGraphicComponent(containerName,"techLabel");
techLabel.init(i,startOffset-lineOffset);
techLabel.setText(lang.get("TechTree"));
i+=100;
i+=120;
mapLabel.registerGraphicComponent(containerName,"mapLabel");
mapLabel.init(i,startOffset-lineOffset);
mapLabel.setText(lang.get("Map"));
i+=100;
tilesetLabel.registerGraphicComponent(containerName,"tilesetLabel");
tilesetLabel.init(i,startOffset-lineOffset);
tilesetLabel.setText(lang.get("Tileset"));
i+=120;
// tilesetLabel.registerGraphicComponent(containerName,"tilesetLabel");
// tilesetLabel.init(i,startOffset-lineOffset);
// tilesetLabel.setText(lang.get("Tileset"));
// i+=100;
i+=100;
activeSlotsLabel.registerGraphicComponent(containerName,"activeSlotsLabel");
activeSlotsLabel.init(i,startOffset-lineOffset);
activeSlotsLabel.setText(lang.get("MGGameSlots"));
@ -190,7 +186,12 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
externalConnectPort.init(i,startOffset-lineOffset);
externalConnectPort.setText(lang.get("Port"));
i+=50;
i+=80;
statusLabel.registerGraphicComponent(containerName,"statusLabel");
statusLabel.init(i,startOffset-lineOffset);
statusLabel.setText(lang.get("MGGameStatus"));
i+=130;
selectButton.registerGraphicComponent(containerName,"selectButton");
selectButton.init(i, startOffset-lineOffset);
selectButton.setText(lang.get("MGJoinGameSlots"));
@ -536,12 +537,12 @@ void MenuStateMasterserver::render(){
renderer.renderLabel(&serverTitleLabel,&titleLabelColor);
renderer.renderLabel(&countryLabel,&titleLabelColor);
renderer.renderLabel(&statusLabel,&titleLabelColor);
renderer.renderLabel(&ipAddressLabel,&titleLabelColor);
//renderer.renderLabel(&ipAddressLabel,&titleLabelColor);
//game setup info:
renderer.renderLabel(&techLabel,&titleLabelColor);
renderer.renderLabel(&mapLabel,&titleLabelColor);
renderer.renderLabel(&tilesetLabel,&titleLabelColor);
//renderer.renderLabel(&tilesetLabel,&titleLabelColor);
renderer.renderLabel(&activeSlotsLabel,&titleLabelColor);
renderer.renderLabel(&externalConnectPort,&titleLabelColor);
renderer.renderLabel(&selectButton,&titleLabelColor);

39
source/glest_game/menu/server_line.cpp
View File

@ -61,7 +61,7 @@ ServerLine::ServerLine( MasterServerInfo *mServerInfo, int lineIndex, int baseY,
serverTitleLabel.init(i,baseY-lineOffset);
serverTitleLabel.setText(masterServerInfo.getServerTitle());
i+=80;
i+=140;
country.init(i,baseY-lineOffset);
country.setText(masterServerInfo.getCountry());
@ -89,32 +89,27 @@ ServerLine::ServerLine( MasterServerInfo *mServerInfo, int lineIndex, int baseY,
renderer.initTexture(rsGlobal,countryTexture);
}
i+=80;
status.init(i,baseY-lineOffset);
status.setText(lang.get("MGGameStatus" + intToStr(masterServerInfo.getStatus())));
i+=90;
ipAddressLabel.init(i,baseY-lineOffset);
ipAddressLabel.setText(masterServerInfo.getIpAddress());
// ipAddressLabel.init(i,baseY-lineOffset);
// ipAddressLabel.setText(masterServerInfo.getIpAddress());
// i+=100;
wrongVersionLabel.init(i,baseY-lineOffset);
wrongVersionLabel.setText(lang.get("IncompatibleVersion"));
//game setup info:
i+=100;
techLabel.init(i,baseY-lineOffset);
techLabel.setText(masterServerInfo.getTech());
i+=100;
i+=120;
mapLabel.init(i,baseY-lineOffset);
mapLabel.setText(masterServerInfo.getMap());
i+=120;
i+=100;
tilesetLabel.init(i,baseY-lineOffset);
tilesetLabel.setText(masterServerInfo.getTileset());
// tilesetLabel.init(i,baseY-lineOffset);
// tilesetLabel.setText(masterServerInfo.getTileset());
// i+=100;
i+=100;
activeSlotsLabel.init(i,baseY-lineOffset);
activeSlotsLabel.setText(intToStr(masterServerInfo.getActiveSlots())+"/"+intToStr(masterServerInfo.getNetworkSlots())+"/"+intToStr(masterServerInfo.getConnectedClients()));
@ -122,7 +117,11 @@ ServerLine::ServerLine( MasterServerInfo *mServerInfo, int lineIndex, int baseY,
externalConnectPort.init(i,baseY-lineOffset);
externalConnectPort.setText(intToStr(masterServerInfo.getExternalConnectPort()));
i+=50;
i+=80;
status.init(i,baseY-lineOffset);
status.setText(lang.get("MGGameStatus" + intToStr(masterServerInfo.getStatus())));
i+=130;
selectButton.init(i, baseY-lineOffset, 30);
selectButton.setText(">");
@ -199,17 +198,17 @@ void ServerLine::render() {
renderer.renderLabel(&country);
}
renderer.renderLabel(&status);
if(gameFull.getEnabled() == false) {
if (compatible) {
renderer.renderLabel(&ipAddressLabel);
//renderer.renderLabel(&ipAddressLabel);
//game setup info:
renderer.renderLabel(&techLabel);
renderer.renderLabel(&mapLabel);
renderer.renderLabel(&tilesetLabel);
//renderer.renderLabel(&tilesetLabel);
renderer.renderLabel(&activeSlotsLabel);
renderer.renderLabel(&externalConnectPort);
renderer.renderLabel(&status);
}
else {
renderer.renderLabel(&wrongVersionLabel);
@ -231,12 +230,12 @@ void ServerLine::setY(int y) {
serverTitleLabel.setY(y);
country.setY(y);
status.setY(y);
ipAddressLabel.setY(y);
//ipAddressLabel.setY(y);
//game setup info:
techLabel.setY(y);
mapLabel.setY(y);
tilesetLabel.setY(y);
//tilesetLabel.setY(y);
activeSlotsLabel.setY(y);
externalConnectPort.setY(y);