mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-17 21:51:17 +02:00
Code Issues Projects Releases Wiki Activity

- added an IRC connection status label to the masterserver menu

Browse Source
This commit is contained in:
Mark Vejvoda
2011-01-20 21:11:39 +00:00
parent 48ce0830de
commit 895dde0de6
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,6 +217,10 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
ircOnlinePeopleLabel.init(userButtonsXBase,userButtonsYBase+userButtonsLineHeight); ircOnlinePeopleLabel.init(userButtonsXBase,userButtonsYBase+userButtonsLineHeight);
ircOnlinePeopleLabel.setText(lang.get("IRCPeopleOnline")); ircOnlinePeopleLabel.setText(lang.get("IRCPeopleOnline"));
ircOnlinePeopleStatusLabel.registerGraphicComponent(containerName,"ircOnlinePeopleStatusLabel");
ircOnlinePeopleStatusLabel.init(userButtonsXBase,userButtonsYBase+userButtonsLineHeight-20);
ircOnlinePeopleStatusLabel.setText("");
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
NetworkManager::getInstance().end(); NetworkManager::getInstance().end();
@@ -530,16 +534,29 @@ void MenuStateMasterserver::render(){
renderer.renderLabel(&externalConnectPort,&titleLabelColor); renderer.renderLabel(&externalConnectPort,&titleLabelColor);
renderer.renderLabel(&selectButton,&titleLabelColor); renderer.renderLabel(&selectButton,&titleLabelColor);
MutexSafeWrapper safeMutexIRCPtr(&mutexIRCClient); Lang &lang= Lang::getInstance();
MutexSafeWrapper safeMutexIRCPtr(&mutexIRCClient);
if(ircClient != NULL && if(ircClient != NULL &&
ircClient->isConnected() == true && ircClient->isConnected() == true &&
ircClient->getHasJoinedChannel() == true) { ircClient->getHasJoinedChannel() == true) {
const Vec4f titleLabelColor = GREEN; const Vec4f titleLabelColor = GREEN;
if(ircOnlinePeopleStatusLabel.getText() != "") {
ircOnlinePeopleStatusLabel.setText("");
}
renderer.renderLabel(&ircOnlinePeopleLabel,&titleLabelColor); renderer.renderLabel(&ircOnlinePeopleLabel,&titleLabelColor);
//renderer.renderLabel(&ircOnlinePeopleStatusLabel,&titleLabelColor);
} }
else { else {
const Vec4f titleLabelColor = RED; const Vec4f titleLabelColor = RED;
if(ircOnlinePeopleStatusLabel.getText() != lang.get("Connecting")) {
ircOnlinePeopleStatusLabel.setText(lang.get("Connecting"));
}
renderer.renderLabel(&ircOnlinePeopleLabel,&titleLabelColor); renderer.renderLabel(&ircOnlinePeopleLabel,&titleLabelColor);
renderer.renderLabel(&ircOnlinePeopleStatusLabel,&titleLabelColor);
} }
safeMutexIRCPtr.ReleaseLock(); safeMutexIRCPtr.ReleaseLock();

1
source/glest_game/menu/menu_state_masterserver.h
View File

@@ -68,6 +68,7 @@ private:
int mainMessageBoxState; int mainMessageBoxState;
GraphicLabel ircOnlinePeopleLabel; GraphicLabel ircOnlinePeopleLabel;
GraphicLabel ircOnlinePeopleStatusLabel;
bool announcementLoaded; bool announcementLoaded;
bool needUpdateFromServer; bool needUpdateFromServer;