Merge branch 'master' of github-softcoder-megaglest:MegaGlest/megaglest-source
This commit is contained in:
commit
cceeecb012
|
@ -55,9 +55,13 @@ ServerLine::ServerLine(MasterServerInfo *mServerInfo, int lineIndex, int baseY,
|
||||||
glestVersionLabel.setFont3D(CoreData::getInstance().getDisplayFontSmall3D());
|
glestVersionLabel.setFont3D(CoreData::getInstance().getDisplayFontSmall3D());
|
||||||
|
|
||||||
i+= 70;
|
i+= 70;
|
||||||
|
string platform=masterServerInfo.getPlatform();
|
||||||
|
int revOffset=platform.find("-Rev");
|
||||||
|
platform=platform.substr(0,revOffset);
|
||||||
|
|
||||||
platformLabel.init(i, baseY - lineOffset);
|
platformLabel.init(i, baseY - lineOffset);
|
||||||
platformLabel.setTextColor(color);
|
platformLabel.setTextColor(color);
|
||||||
platformLabel.setText(masterServerInfo.getPlatform());
|
platformLabel.setText(platform);
|
||||||
platformLabel.setFont(CoreData::getInstance().getDisplayFontSmall());
|
platformLabel.setFont(CoreData::getInstance().getDisplayFontSmall());
|
||||||
platformLabel.setFont3D(CoreData::getInstance().getDisplayFontSmall3D());
|
platformLabel.setFont3D(CoreData::getInstance().getDisplayFontSmall3D());
|
||||||
|
|
||||||
|
@ -159,7 +163,11 @@ void ServerLine::reloadUI() {
|
||||||
|
|
||||||
glestVersionLabel.setText(masterServerInfo.getGlestVersion());
|
glestVersionLabel.setText(masterServerInfo.getGlestVersion());
|
||||||
|
|
||||||
platformLabel.setText(masterServerInfo.getPlatform());
|
string platform=masterServerInfo.getPlatform();
|
||||||
|
int revOffset=platform.find("-Rev");
|
||||||
|
platform=platform.substr(0,revOffset);
|
||||||
|
|
||||||
|
platformLabel.setText(platform);
|
||||||
|
|
||||||
serverTitleLabel.setText(masterServerInfo.getServerTitle());
|
serverTitleLabel.setText(masterServerInfo.getServerTitle());
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user