bugfix for game name when not in headless mode

This commit is contained in:
Mark Vejvoda
2011-10-20 23:44:01 +00:00
parent a58451333e
commit 35a5f44db0

View File

@@ -390,11 +390,11 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
labelGameName.init(110, networkHeadPos-2*labelOffset,100); labelGameName.init(110, networkHeadPos-2*labelOffset,100);
labelGameName.setFont(CoreData::getInstance().getMenuFontBig()); labelGameName.setFont(CoreData::getInstance().getMenuFontBig());
labelGameName.setFont3D(CoreData::getInstance().getMenuFontBig3D()); labelGameName.setFont3D(CoreData::getInstance().getMenuFontBig3D());
if(Window::getMasterserverMode() == false) { if(this->masterserverMode == false) {
labelGameName.setText(defaultPlayerName+"'s game"); labelGameName.setText(defaultPlayerName+"'s game");
} }
else { else {
labelGameName.setText("headless("+defaultPlayerName+")"); labelGameName.setText("headless ("+defaultPlayerName+")");
} }
// Network Frame Period // Network Frame Period
//labelNetworkFramePeriod.registerGraphicComponent(containerName,"labelNetworkFramePeriod"); //labelNetworkFramePeriod.registerGraphicComponent(containerName,"labelNetworkFramePeriod");
@@ -2776,9 +2776,9 @@ void MenuStateCustomGame::loadGameSettings(GameSettings *gameSettings,bool force
} }
} }
} }
if(!masterserver_admin_found)
{ if(this->masterserverMode == true && !masterserver_admin_found) {
labelGameName.setText("headless("+defaultPlayerName+")"); labelGameName.setText("headless ("+defaultPlayerName+")");
} }
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__); if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__);
} }