From a01ae45edebf17dbc36dd2eec7f1205b92b3bcc1 Mon Sep 17 00:00:00 2001 From: Titus Tscharntke Date: Wed, 13 Oct 2010 19:16:04 +0000 Subject: [PATCH] Similar to announcements a version info is implemented now. We can put there an info string which will tell the user that his version is outdated and he should update or whatever. --- .../menu/menu_state_masterserver.cpp | 18 ++++++++++++++++-- .../glest_game/menu/menu_state_masterserver.h | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/source/glest_game/menu/menu_state_masterserver.cpp b/source/glest_game/menu/menu_state_masterserver.cpp index 039d8e05..55841e36 100644 --- a/source/glest_game/menu/menu_state_masterserver.cpp +++ b/source/glest_game/menu/menu_state_masterserver.cpp @@ -44,7 +44,7 @@ ServerLine::ServerLine( MasterServerInfo *mServerInfo, int lineIndex, const char int lineOffset=25*lineIndex; masterServerInfo=mServerInfo; int i=10; - int startOffset=630; + int startOffset=600; //general info: i+=10; @@ -200,9 +200,14 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen announcementLabel.setFont(CoreData::getInstance().getMenuFontBig()); announcementLabel.setText(""); + // versionInfo + versionInfoLabel.registerGraphicComponent(containerName,"versionInfoLabel"); + versionInfoLabel.init(10, 680); + versionInfoLabel.setFont(CoreData::getInstance().getMenuFontBig()); + versionInfoLabel.setText(""); // header labelTitle.registerGraphicComponent(containerName,"labelTitle"); - labelTitle.init(330, 670); + labelTitle.init(330, 640); labelTitle.setFont(CoreData::getInstance().getMenuFontBig()); labelTitle.setText(lang.get("AvailableServers")); @@ -416,6 +421,7 @@ void MenuStateMasterserver::render(){ renderer.renderButton(&buttonReturn); renderer.renderLabel(&labelTitle); renderer.renderLabel(&announcementLabel); + renderer.renderLabel(&versionInfoLabel); renderer.renderLabel(&labelAutoRefresh); renderer.renderLabel(&labelChatUrl); renderer.renderButton(&buttonCreateGame); @@ -499,6 +505,14 @@ void MenuStateMasterserver::updateServerInfo() { announcementLabel.setText(announcementTxt); } } + string versionURL = Config::getInstance().getString("versionURL","http://megaglest.pepper.freeit.org/")+glestVersionString+".txt"; + printf("\nversionURL=%s\n",versionURL.c_str()); + if(versionURL != "") { + std::string versionTxt = SystemFlags::getHTTP(versionURL); + if(StartsWith(versionTxt,"Version info:") == true) { + versionInfoLabel.setText(versionTxt); + } + } announcementLoaded=true; } diff --git a/source/glest_game/menu/menu_state_masterserver.h b/source/glest_game/menu/menu_state_masterserver.h index 699b8b8e..5a84b9f1 100644 --- a/source/glest_game/menu/menu_state_masterserver.h +++ b/source/glest_game/menu/menu_state_masterserver.h @@ -86,6 +86,7 @@ private: GraphicLabel labelChatUrl; GraphicLabel announcementLabel; + GraphicLabel versionInfoLabel; GraphicMessageBox mainMessageBox;