mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-01 20:12:40 +02:00
Code Issues Projects Releases Wiki Activity

hopefully the masterserver listing works now ...

Browse Source
This commit is contained in:
Titus Tscharntke
2011-02-17 00:54:17 +00:00
parent 69a7f8f1d6
commit 050a604390
1 changed files with 84 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,18 +19,17 @@
#include "auto_test.h" #include "auto_test.h"
#include "masterserver_info.h" #include "masterserver_info.h"
#include "leak_dumper.h" #include "leak_dumper.h"
namespace Glest {
namespace Game {
namespace Glest{ namespace Game{
// ===================================================== // =====================================================
// class ServerLine // class ServerLine
// ===================================================== // =====================================================
ServerLine::ServerLine( MasterServerInfo *mServerInfo, int lineIndex, int baseY, int lineHeight, const char * containerName) { ServerLine::ServerLine(MasterServerInfo *mServerInfo, int lineIndex, int baseY, int lineHeight,
const char * containerName){
this->containerName= containerName; this->containerName= containerName;
this->countryTexture= NULL; this->countryTexture= NULL;
Lang &lang= Lang::getInstance(); Lang &lang= Lang::getInstance();
@@ -111,7 +110,8 @@ ServerLine::ServerLine( MasterServerInfo *mServerInfo, int lineIndex, int baseY,
// i+=100; // i+=100;
activeSlotsLabel.init(i, baseY - lineOffset); activeSlotsLabel.init(i, baseY - lineOffset);
activeSlotsLabel.setText(intToStr(masterServerInfo.getActiveSlots())+"/"+intToStr(masterServerInfo.getNetworkSlots())+"/"+intToStr(masterServerInfo.getConnectedClients())); activeSlotsLabel.setText(intToStr(masterServerInfo.getActiveSlots()) + "/" + intToStr(
masterServerInfo.getNetworkSlots()) + "/" + intToStr(masterServerInfo.getConnectedClients()));
i+= 50; i+= 50;
externalConnectPort.init(i, baseY - lineOffset); externalConnectPort.init(i, baseY - lineOffset);
@@ -161,10 +161,12 @@ void ServerLine::render() {
bool joinEnabled= (masterServerInfo.getNetworkSlots() > masterServerInfo.getConnectedClients()); bool joinEnabled= (masterServerInfo.getNetworkSlots() > masterServerInfo.getConnectedClients());
if(joinEnabled == true){ if(joinEnabled == true){
if(compatible){
selectButton.setEnabled(true); selectButton.setEnabled(true);
selectButton.setVisible(true); selectButton.setVisible(true);
renderer.renderButton(&selectButton); renderer.renderButton(&selectButton);
} }
}
else{ else{
selectButton.setEnabled(false); selectButton.setEnabled(false);
selectButton.setVisible(false); selectButton.setVisible(false);
@@ -175,21 +177,19 @@ void ServerLine::render() {
renderer.renderLabel(&platformLabel); renderer.renderLabel(&platformLabel);
//renderer.renderLabel(&binaryCompileDateLabel); //renderer.renderLabel(&binaryCompileDateLabel);
//game info: //game info:
renderer.renderLabel(&serverTitleLabel); renderer.renderLabel(&serverTitleLabel);
if(countryTexture != NULL){ if(countryTexture != NULL){
renderer.renderTextureQuad(country.getX() + 20,country.getY(),countryTexture->getTextureWidth(),countryTexture->getTextureHeight(),countryTexture,0.7f); renderer.renderTextureQuad(country.getX() + 20, country.getY(), countryTexture->getTextureWidth(),
countryTexture->getTextureHeight(), countryTexture, 0.7f);
} }
else{ else{
renderer.renderLabel(&country); renderer.renderLabel(&country);
} }
if(compatible){ if(compatible){
renderer.renderLabel(&status);
}
if(selectButton.getEnabled() == true){ if(selectButton.getEnabled() == true){
if (compatible) {
//renderer.renderLabel(&ipAddressLabel); //renderer.renderLabel(&ipAddressLabel);
//game setup info: //game setup info:
renderer.renderLabel(&techLabel); renderer.renderLabel(&techLabel);
renderer.renderLabel(&mapLabel); renderer.renderLabel(&mapLabel);
@@ -198,12 +198,13 @@ void ServerLine::render() {
renderer.renderLabel(&externalConnectPort); renderer.renderLabel(&externalConnectPort);
renderer.renderLabel(&status); renderer.renderLabel(&status);
} }
}
else{ else{
renderer.renderLabel(&wrongVersionLabel); renderer.renderLabel(&wrongVersionLabel);
} }
renderer.renderLabel(&status);
} }
}
void ServerLine::setY(int y){ void ServerLine::setY(int y){
selectButton.setY(y); selectButton.setY(y);
@@ -229,4 +230,5 @@ void ServerLine::setY(int y) {
} }
}}//end namespace }
}//end namespace