Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

battle configuration screen with more synchronized look (host/admin<>client) and more friendly for other than english languages

Browse Source
This commit is contained in:
filux 2015-02-06 01:26:16 +01:00
parent e139f1c9a9
commit 3728fff67b
2 changed files with 98 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
source/glest_game/menu/menu_state_connected_game.cpp
View File

@ -198,30 +198,7 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
labelDataSynchInfo.setFont(CoreData::getInstance().getMenuFontBig()); labelDataSynchInfo.setFont(CoreData::getInstance().getMenuFontBig());
labelDataSynchInfo.setFont3D(CoreData::getInstance().getMenuFontBig3D()); labelDataSynchInfo.setFont3D(CoreData::getInstance().getMenuFontBig3D());
// fog - o - war int xoffset=90;
int xoffset=70;
labelFogOfWar.registerGraphicComponent(containerName,"labelFogOfWar");
labelFogOfWar.init(xoffset+100, aHeadPos, 130);
labelFogOfWar.setText(lang.getString("FogOfWar"));
listBoxFogOfWar.registerGraphicComponent(containerName,"listBoxFogOfWar");
listBoxFogOfWar.init(xoffset+100, aPos, 150);
listBoxFogOfWar.pushBackItem(lang.getString("Enabled"));
listBoxFogOfWar.pushBackItem(lang.getString("Explored"));
listBoxFogOfWar.pushBackItem(lang.getString("Disabled"));
listBoxFogOfWar.setSelectedItemIndex(0);
listBoxFogOfWar.setEditable(false);
labelAllowObservers.registerGraphicComponent(containerName,"labelAllowObservers");
labelAllowObservers.init(xoffset+310, aHeadPos, 80);
labelAllowObservers.setText(lang.getString("AllowObservers"));
checkBoxAllowObservers.registerGraphicComponent(containerName,"checkBoxAllowObservers");
checkBoxAllowObservers.init(xoffset+310, aPos);
checkBoxAllowObservers.setValue(false);
checkBoxAllowObservers.setEditable(false);
labelAllowTeamUnitSharing.registerGraphicComponent(containerName,"labelAllowTeamUnitSharing"); labelAllowTeamUnitSharing.registerGraphicComponent(containerName,"labelAllowTeamUnitSharing");
labelAllowTeamUnitSharing.init(xoffset+410, 670, 80); labelAllowTeamUnitSharing.init(xoffset+410, 670, 80);
labelAllowTeamUnitSharing.setText(lang.getString("AllowTeamUnitSharing")); labelAllowTeamUnitSharing.setText(lang.getString("AllowTeamUnitSharing"));
@ -244,36 +221,59 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
checkBoxAllowTeamResourceSharing.setVisible(true); checkBoxAllowTeamResourceSharing.setVisible(true);
checkBoxAllowTeamResourceSharing.setEditable(false); checkBoxAllowTeamResourceSharing.setEditable(false);
// fog - o - war
xoffset=62;
labelFogOfWar.registerGraphicComponent(containerName,"labelFogOfWar");
labelFogOfWar.init(xoffset+100, aHeadPos, 165);
labelFogOfWar.setText(lang.getString("FogOfWar"));
listBoxFogOfWar.registerGraphicComponent(containerName,"listBoxFogOfWar");
listBoxFogOfWar.init(xoffset+100, aPos, 165);
listBoxFogOfWar.pushBackItem(lang.getString("Enabled"));
listBoxFogOfWar.pushBackItem(lang.getString("Explored"));
listBoxFogOfWar.pushBackItem(lang.getString("Disabled"));
listBoxFogOfWar.setSelectedItemIndex(0);
listBoxFogOfWar.setEditable(false);
labelAllowObservers.registerGraphicComponent(containerName,"labelAllowObservers");
labelAllowObservers.init(xoffset+325, aHeadPos, 80);
labelAllowObservers.setText(lang.getString("AllowObservers"));
checkBoxAllowObservers.registerGraphicComponent(containerName,"checkBoxAllowObservers");
checkBoxAllowObservers.init(xoffset+325, aPos);
checkBoxAllowObservers.setValue(false);
checkBoxAllowObservers.setEditable(false);
for(int i=0; i<45; ++i){ for(int i=0; i<45; ++i){
rMultiplier.push_back(floatToStr(0.5f+0.1f*i,1)); rMultiplier.push_back(floatToStr(0.5f+0.1f*i,1));
} }
labelFallbackCpuMultiplier.registerGraphicComponent(containerName,"labelFallbackCpuMultiplier"); labelFallbackCpuMultiplier.registerGraphicComponent(containerName,"labelFallbackCpuMultiplier");
labelFallbackCpuMultiplier.init(xoffset+460, aHeadPos, 80); labelFallbackCpuMultiplier.init(xoffset+500, aHeadPos, 80);
labelFallbackCpuMultiplier.setText(lang.getString("FallbackCpuMultiplier")); labelFallbackCpuMultiplier.setText(lang.getString("FallbackCpuMultiplier"));
listBoxFallbackCpuMultiplier.registerGraphicComponent(containerName,"listBoxFallbackCpuMultiplier"); listBoxFallbackCpuMultiplier.registerGraphicComponent(containerName,"listBoxFallbackCpuMultiplier");
listBoxFallbackCpuMultiplier.init(xoffset+460, aPos, 80); listBoxFallbackCpuMultiplier.init(xoffset+500, aPos, 80);
listBoxFallbackCpuMultiplier.setItems(rMultiplier); listBoxFallbackCpuMultiplier.setItems(rMultiplier);
listBoxFallbackCpuMultiplier.setSelectedItem("1.0"); listBoxFallbackCpuMultiplier.setSelectedItem("1.0");
// Allow Switch Team Mode // Allow Switch Team Mode
labelEnableSwitchTeamMode.registerGraphicComponent(containerName,"labelEnableSwitchTeamMode"); labelEnableSwitchTeamMode.registerGraphicComponent(containerName,"labelEnableSwitchTeamMode");
labelEnableSwitchTeamMode.init(xoffset+310, aHeadPos+45, 80); labelEnableSwitchTeamMode.init(xoffset+325, aHeadPos+45, 80);
labelEnableSwitchTeamMode.setText(lang.getString("EnableSwitchTeamMode")); labelEnableSwitchTeamMode.setText(lang.getString("EnableSwitchTeamMode"));
checkBoxEnableSwitchTeamMode.registerGraphicComponent(containerName,"checkBoxEnableSwitchTeamMode"); checkBoxEnableSwitchTeamMode.registerGraphicComponent(containerName,"checkBoxEnableSwitchTeamMode");
checkBoxEnableSwitchTeamMode.init(xoffset+310, aPos+45); checkBoxEnableSwitchTeamMode.init(xoffset+325, aPos+45);
checkBoxEnableSwitchTeamMode.setValue(false); checkBoxEnableSwitchTeamMode.setValue(false);
checkBoxEnableSwitchTeamMode.setEditable(false); checkBoxEnableSwitchTeamMode.setEditable(false);
labelAISwitchTeamAcceptPercent.registerGraphicComponent(containerName,"labelAISwitchTeamAcceptPercent"); labelAISwitchTeamAcceptPercent.registerGraphicComponent(containerName,"labelAISwitchTeamAcceptPercent");
labelAISwitchTeamAcceptPercent.init(xoffset+460, aHeadPos+45, 80); labelAISwitchTeamAcceptPercent.init(xoffset+500, aHeadPos+45, 80);
labelAISwitchTeamAcceptPercent.setText(lang.getString("AISwitchTeamAcceptPercent")); labelAISwitchTeamAcceptPercent.setText(lang.getString("AISwitchTeamAcceptPercent"));
listBoxAISwitchTeamAcceptPercent.registerGraphicComponent(containerName,"listBoxAISwitchTeamAcceptPercent"); listBoxAISwitchTeamAcceptPercent.registerGraphicComponent(containerName,"listBoxAISwitchTeamAcceptPercent");
listBoxAISwitchTeamAcceptPercent.init(xoffset+460, aPos+45, 80); listBoxAISwitchTeamAcceptPercent.init(xoffset+500, aPos+45, 80);
for(int i = 0; i <= 100; i = i + 10) { for(int i = 0; i <= 100; i = i + 10) {
listBoxAISwitchTeamAcceptPercent.pushBackItem(intToStr(i)); listBoxAISwitchTeamAcceptPercent.pushBackItem(intToStr(i));
} }
@ -286,12 +286,12 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
buttonCancelDownloads.setText(lang.getString("CancelDownloads")); buttonCancelDownloads.setText(lang.getString("CancelDownloads"));
// Network Frame Period // Network Frame Period
xoffset=70; xoffset=62;
//map listBox //map listBox
// put them all in a set, to weed out duplicates (gbm & mgm with same name) // put them all in a set, to weed out duplicates (gbm & mgm with same name)
// will also ensure they are alphabetically listed (rather than how the OS provides them) // will also ensure they are alphabetically listed (rather than how the OS provides them)
listBoxMap.registerGraphicComponent(containerName,"listBoxMap"); listBoxMap.registerGraphicComponent(containerName,"listBoxMap");
listBoxMap.init(xoffset+100, mapPos, 200); listBoxMap.init(xoffset+100, mapPos, 220);
listBoxMap.setEditable(false); listBoxMap.setEditable(false);
labelMapInfo.registerGraphicComponent(containerName,"labelMapInfo"); labelMapInfo.registerGraphicComponent(containerName,"labelMapInfo");
@ -304,11 +304,11 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
//tileset listBox //tileset listBox
listBoxTileset.registerGraphicComponent(containerName,"listBoxTileset"); listBoxTileset.registerGraphicComponent(containerName,"listBoxTileset");
listBoxTileset.init(xoffset+460, mapPos, 150); listBoxTileset.init(xoffset+500, mapPos, 160);
listBoxTileset.setEditable(false); listBoxTileset.setEditable(false);
labelTileset.registerGraphicComponent(containerName,"labelTileset"); labelTileset.registerGraphicComponent(containerName,"labelTileset");
labelTileset.init(xoffset+460, mapHeadPos); labelTileset.init(xoffset+500, mapHeadPos);
labelTileset.setText(lang.getString("Tileset")); labelTileset.setText(lang.getString("Tileset"));
@ -316,63 +316,63 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
listBoxTechTree.setEditable(false); listBoxTechTree.setEditable(false);
listBoxTechTree.registerGraphicComponent(containerName,"listBoxTechTree"); listBoxTechTree.registerGraphicComponent(containerName,"listBoxTechTree");
listBoxTechTree.init(xoffset+620, mapPos, 150); listBoxTechTree.init(xoffset+700, mapPos, 180);
labelTechTree.registerGraphicComponent(containerName,"labelTechTree"); labelTechTree.registerGraphicComponent(containerName,"labelTechTree");
labelTechTree.init(xoffset+620, mapHeadPos); labelTechTree.init(xoffset+700, mapHeadPos);
labelTechTree.setText(lang.getString("TechTree")); labelTechTree.setText(lang.getString("TechTree"));
labelAllowNativeLanguageTechtree.registerGraphicComponent(containerName,"labelAllowNativeLanguageTechtree"); labelAllowNativeLanguageTechtree.registerGraphicComponent(containerName,"labelAllowNativeLanguageTechtree");
labelAllowNativeLanguageTechtree.init(xoffset+620, mapHeadPos-45); labelAllowNativeLanguageTechtree.init(xoffset+700, aHeadPos+45);
labelAllowNativeLanguageTechtree.setText(lang.getString("AllowNativeLanguageTechtree")); labelAllowNativeLanguageTechtree.setText(lang.getString("AllowNativeLanguageTechtree"));
checkBoxAllowNativeLanguageTechtree.registerGraphicComponent(containerName,"checkBoxAllowNativeLanguageTechtree"); checkBoxAllowNativeLanguageTechtree.registerGraphicComponent(containerName,"checkBoxAllowNativeLanguageTechtree");
checkBoxAllowNativeLanguageTechtree.init(xoffset+620, mapHeadPos-65); checkBoxAllowNativeLanguageTechtree.init(xoffset+700, aPos+45);
checkBoxAllowNativeLanguageTechtree.setValue(false); checkBoxAllowNativeLanguageTechtree.setValue(false);
checkBoxAllowNativeLanguageTechtree.setEditable(false); checkBoxAllowNativeLanguageTechtree.setEditable(false);
checkBoxAllowNativeLanguageTechtree.setEnabled(false); checkBoxAllowNativeLanguageTechtree.setEnabled(false);
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__); if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
xoffset=30; xoffset=5;
int rowHeight=27; int rowHeight=27;
for(int i=0; i<GameConstants::maxPlayers; ++i){ for(int i=0; i<GameConstants::maxPlayers; ++i){
labelPlayers[i].registerGraphicComponent(containerName,"labelPlayers" + intToStr(i)); labelPlayers[i].registerGraphicComponent(containerName,"labelPlayers" + intToStr(i));
labelPlayers[i].init(xoffset, setupPos-30-i*rowHeight+2); labelPlayers[i].init(xoffset, setupPos-30-i*rowHeight+2);
labelPlayers[i].setFont(CoreData::getInstance().getMenuFontBig()); labelPlayers[i].setFont(CoreData::getInstance().getMenuFontVeryBig());
labelPlayers[i].setFont3D(CoreData::getInstance().getMenuFontBig3D()); labelPlayers[i].setFont3D(CoreData::getInstance().getMenuFontVeryBig3D());
labelPlayers[i].setEditable(false); labelPlayers[i].setEditable(false);
labelPlayerStatus[i].registerGraphicComponent(containerName,"labelPlayerStatus" + intToStr(i)); labelPlayerStatus[i].registerGraphicComponent(containerName,"labelPlayerStatus" + intToStr(i));
labelPlayerStatus[i].init(xoffset+15, setupPos-30-i*rowHeight+2, 60); labelPlayerStatus[i].init(xoffset+15, setupPos-30-i*rowHeight+2, 60);
labelPlayerNames[i].registerGraphicComponent(containerName,"labelPlayerNames" + intToStr(i)); labelPlayerNames[i].registerGraphicComponent(containerName,"labelPlayerNames" + intToStr(i));
labelPlayerNames[i].init(xoffset+30,setupPos-30-i*rowHeight); labelPlayerNames[i].init(xoffset+33,setupPos-30-i*rowHeight);
listBoxControls[i].registerGraphicComponent(containerName,"listBoxControls" + intToStr(i)); listBoxControls[i].registerGraphicComponent(containerName,"listBoxControls" + intToStr(i));
listBoxControls[i].init(xoffset+170, setupPos-30-i*rowHeight); listBoxControls[i].init(xoffset+170, setupPos-30-i*rowHeight, 170);
listBoxControls[i].setEditable(false); listBoxControls[i].setEditable(false);
listBoxRMultiplier[i].registerGraphicComponent(containerName,"listBoxRMultiplier" + intToStr(i)); listBoxRMultiplier[i].registerGraphicComponent(containerName,"listBoxRMultiplier" + intToStr(i));
listBoxRMultiplier[i].init(xoffset+310, setupPos-30-i*rowHeight,70); listBoxRMultiplier[i].init(xoffset+342, setupPos-30-i*rowHeight,68);
listBoxRMultiplier[i].setEditable(false); listBoxRMultiplier[i].setEditable(false);
listBoxFactions[i].registerGraphicComponent(containerName,"listBoxFactions" + intToStr(i)); listBoxFactions[i].registerGraphicComponent(containerName,"listBoxFactions" + intToStr(i));
listBoxFactions[i].init(xoffset+390, setupPos-30-i*rowHeight, 250); listBoxFactions[i].init(xoffset+415, setupPos-30-i*rowHeight, 250);
listBoxFactions[i].setLeftControlled(true); listBoxFactions[i].setLeftControlled(true);
listBoxFactions[i].setEditable(false); listBoxFactions[i].setEditable(false);
listBoxTeams[i].registerGraphicComponent(containerName,"listBoxTeams" + intToStr(i)); listBoxTeams[i].registerGraphicComponent(containerName,"listBoxTeams" + intToStr(i));
listBoxTeams[i].init(xoffset+650, setupPos-30-i*rowHeight, 60); listBoxTeams[i].init(xoffset+667, setupPos-30-i*rowHeight, 60);
listBoxTeams[i].setEditable(false); listBoxTeams[i].setEditable(false);
listBoxTeams[i].setLighted(true); listBoxTeams[i].setLighted(true);
labelNetStatus[i].registerGraphicComponent(containerName,"labelNetStatus" + intToStr(i)); labelNetStatus[i].registerGraphicComponent(containerName,"labelNetStatus" + intToStr(i));
labelNetStatus[i].init(xoffset+715, setupPos-30-i*rowHeight, 60); labelNetStatus[i].init(xoffset+733, setupPos-30-i*rowHeight, 60);
labelNetStatus[i].setFont(CoreData::getInstance().getDisplayFontSmall()); labelNetStatus[i].setFont(CoreData::getInstance().getDisplayFontSmall());
labelNetStatus[i].setFont3D(CoreData::getInstance().getDisplayFontSmall3D()); labelNetStatus[i].setFont3D(CoreData::getInstance().getDisplayFontSmall3D());
grabSlotButton[i].registerGraphicComponent(containerName,"grabSlotButton" + intToStr(i)); grabSlotButton[i].registerGraphicComponent(containerName,"grabSlotButton" + intToStr(i));
grabSlotButton[i].init(xoffset+720, setupPos-30-i*rowHeight, 30); grabSlotButton[i].init(xoffset+733, setupPos-30-i*rowHeight, 35, rowHeight-5);
grabSlotButton[i].setText(">"); grabSlotButton[i].setText(">");
} }
@ -456,11 +456,11 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
setupMapList(""); setupMapList("");
listBoxMap.setItems(formattedPlayerSortedMaps[0]); listBoxMap.setItems(formattedPlayerSortedMaps[0]);
int buttonx=170; int buttonx=162;
int buttony=180; int buttony=180;
listBoxPlayerStatus.registerGraphicComponent(containerName,"listBoxPlayerStatus"); listBoxPlayerStatus.registerGraphicComponent(containerName,"listBoxPlayerStatus");
listBoxPlayerStatus.init(buttonx, buttony, 150); listBoxPlayerStatus.init(buttonx, buttony, 165);
listBoxPlayerStatus.setTextColor(Vec3f(1.0f,0.f,0.f)); listBoxPlayerStatus.setTextColor(Vec3f(1.0f,0.f,0.f));
listBoxPlayerStatus.setLighted(true); listBoxPlayerStatus.setLighted(true);
playerStatuses.push_back(lang.getString("PlayerStatusSetup")); playerStatuses.push_back(lang.getString("PlayerStatusSetup"));
@ -474,9 +474,9 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
buttonx+=130; buttonx+=130;
buttonRestoreLastSettings.registerGraphicComponent(containerName,"buttonRestoreLastSettings"); buttonRestoreLastSettings.registerGraphicComponent(containerName,"buttonRestoreLastSettings");
buttonRestoreLastSettings.init(buttonx, buttony, 220); buttonRestoreLastSettings.init(buttonx, buttony, 240);
buttonRestoreLastSettings.setText(lang.getString("ReloadLastGameSettings")); buttonRestoreLastSettings.setText(lang.getString("ReloadLastGameSettings"));
buttonx+=225; buttonx+=245;
buttonPlayNow.registerGraphicComponent(containerName,"buttonPlayNow"); buttonPlayNow.registerGraphicComponent(containerName,"buttonPlayNow");
buttonPlayNow.init(buttonx, buttony, 125); buttonPlayNow.init(buttonx, buttony, 125);
@ -498,7 +498,7 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
int initialTechSelection = setupTechList("",true); int initialTechSelection = setupTechList("",true);
listBoxTechTree.setSelectedItemIndex(initialTechSelection); listBoxTechTree.setSelectedItemIndex(initialTechSelection);
int scenarioX=810; int scenarioX=800;
int scenarioY=140; int scenarioY=140;
labelScenario.registerGraphicComponent(containerName,"labelScenario"); labelScenario.registerGraphicComponent(containerName,"labelScenario");
labelScenario.init(scenarioX, scenarioY); labelScenario.init(scenarioX, scenarioY);

90
source/glest_game/menu/menu_state_custom_game.cpp
View File

@ -194,12 +194,12 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
int xoffset=10; int xoffset=10;
//create //create
int buttonx=170; int buttonx=162;
int buttony=180; int buttony=180;
// player status // player status
listBoxPlayerStatus.registerGraphicComponent(containerName,"listBoxPlayerStatus"); listBoxPlayerStatus.registerGraphicComponent(containerName,"listBoxPlayerStatus");
listBoxPlayerStatus.init(buttonx, buttony, 150); listBoxPlayerStatus.init(buttonx, buttony, 165);
vector<string> playerStatuses; vector<string> playerStatuses;
playerStatuses.push_back(lang.getString("PlayerStatusSetup")); playerStatuses.push_back(lang.getString("PlayerStatusSetup"));
playerStatuses.push_back(lang.getString("PlayerStatusBeRightBack")); playerStatuses.push_back(lang.getString("PlayerStatusBeRightBack"));
@ -216,8 +216,8 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
buttonx+=130; buttonx+=130;
buttonRestoreLastSettings.registerGraphicComponent(containerName,"buttonRestoreLastSettings"); buttonRestoreLastSettings.registerGraphicComponent(containerName,"buttonRestoreLastSettings");
buttonRestoreLastSettings.init(buttonx, buttony, 220); buttonRestoreLastSettings.init(buttonx, buttony, 240);
buttonx+=225; buttonx+=245;
buttonPlayNow.registerGraphicComponent(containerName,"buttonPlayNow"); buttonPlayNow.registerGraphicComponent(containerName,"buttonPlayNow");
buttonPlayNow.init(buttonx, buttony, 125); buttonPlayNow.init(buttonx, buttony, 125);
@ -252,14 +252,14 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
labelLocalGameVersion.setText(glestVersionString + " [" + getCompileDateTime() + ", " + getGITRevisionString() + "]"); labelLocalGameVersion.setText(glestVersionString + " [" + getCompileDateTime() + ", " + getGITRevisionString() + "]");
} }
xoffset=70; xoffset=62;
// MapFilter // MapFilter
labelMapFilter.registerGraphicComponent(containerName,"labelMapFilter"); labelMapFilter.registerGraphicComponent(containerName,"labelMapFilter");
labelMapFilter.init(xoffset+310, mapHeadPos); labelMapFilter.init(xoffset+325, mapHeadPos);
labelMapFilter.setText(lang.getString("MapFilter")+":"); labelMapFilter.setText(lang.getString("MapFilter"));
listBoxMapFilter.registerGraphicComponent(containerName,"listBoxMapFilter"); listBoxMapFilter.registerGraphicComponent(containerName,"listBoxMapFilter");
listBoxMapFilter.init(xoffset+310, mapPos, 80); listBoxMapFilter.init(xoffset+325, mapPos, 80);
listBoxMapFilter.pushBackItem("-"); listBoxMapFilter.pushBackItem("-");
for(int i=1; i<GameConstants::maxPlayers+1; ++i){ for(int i=1; i<GameConstants::maxPlayers+1; ++i){
listBoxMapFilter.pushBackItem(intToStr(i)); listBoxMapFilter.pushBackItem(intToStr(i));
@ -269,11 +269,11 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
// Map // Map
labelMap.registerGraphicComponent(containerName,"labelMap"); labelMap.registerGraphicComponent(containerName,"labelMap");
labelMap.init(xoffset+100, mapHeadPos); labelMap.init(xoffset+100, mapHeadPos);
labelMap.setText(lang.getString("Map")+":"); labelMap.setText(lang.getString("Map"));
//map listBox //map listBox
listBoxMap.registerGraphicComponent(containerName,"listBoxMap"); listBoxMap.registerGraphicComponent(containerName,"listBoxMap");
listBoxMap.init(xoffset+100, mapPos, 200); listBoxMap.init(xoffset+100, mapPos, 220);
// put them all in a set, to weed out duplicates (gbm & mgm with same name) // put them all in a set, to weed out duplicates (gbm & mgm with same name)
// will also ensure they are alphabetically listed (rather than how the OS provides them) // will also ensure they are alphabetically listed (rather than how the OS provides them)
int initialMapSelection = setupMapList(""); int initialMapSelection = setupMapList("");
@ -284,12 +284,12 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
labelMapInfo.init(xoffset+100, mapPos-labelOffset-10, 200, 40); labelMapInfo.init(xoffset+100, mapPos-labelOffset-10, 200, 40);
labelTileset.registerGraphicComponent(containerName,"labelTileset"); labelTileset.registerGraphicComponent(containerName,"labelTileset");
labelTileset.init(xoffset+460, mapHeadPos); labelTileset.init(xoffset+500, mapHeadPos);
labelTileset.setText(lang.getString("Tileset")); labelTileset.setText(lang.getString("Tileset"));
//tileset listBox //tileset listBox
listBoxTileset.registerGraphicComponent(containerName,"listBoxTileset"); listBoxTileset.registerGraphicComponent(containerName,"listBoxTileset");
listBoxTileset.init(xoffset+460, mapPos, 150); listBoxTileset.init(xoffset+500, mapPos, 160);
setupTilesetList(""); setupTilesetList("");
Chrono seed(true); Chrono seed(true);
@ -301,23 +301,23 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
int initialTechSelection = setupTechList("", true); int initialTechSelection = setupTechList("", true);
listBoxTechTree.registerGraphicComponent(containerName,"listBoxTechTree"); listBoxTechTree.registerGraphicComponent(containerName,"listBoxTechTree");
listBoxTechTree.init(xoffset+650, mapPos, 150); listBoxTechTree.init(xoffset+700, mapPos, 180);
if(listBoxTechTree.getItemCount() > 0) { if(listBoxTechTree.getItemCount() > 0) {
listBoxTechTree.setSelectedItemIndex(initialTechSelection); listBoxTechTree.setSelectedItemIndex(initialTechSelection);
} }
labelTechTree.registerGraphicComponent(containerName,"labelTechTree"); labelTechTree.registerGraphicComponent(containerName,"labelTechTree");
labelTechTree.init(xoffset+650, mapHeadPos); labelTechTree.init(xoffset+700, mapHeadPos);
labelTechTree.setText(lang.getString("TechTree")); labelTechTree.setText(lang.getString("TechTree"));
// fog - o - war // fog - o - war
// @350 ? 300 ? // @350 ? 300 ?
labelFogOfWar.registerGraphicComponent(containerName,"labelFogOfWar"); labelFogOfWar.registerGraphicComponent(containerName,"labelFogOfWar");
labelFogOfWar.init(xoffset+100, aHeadPos, 130); labelFogOfWar.init(xoffset+100, aHeadPos, 165);
labelFogOfWar.setText(lang.getString("FogOfWar")); labelFogOfWar.setText(lang.getString("FogOfWar"));
listBoxFogOfWar.registerGraphicComponent(containerName,"listBoxFogOfWar"); listBoxFogOfWar.registerGraphicComponent(containerName,"listBoxFogOfWar");
listBoxFogOfWar.init(xoffset+100, aPos, 130); listBoxFogOfWar.init(xoffset+100, aPos, 165);
listBoxFogOfWar.pushBackItem(lang.getString("Enabled")); listBoxFogOfWar.pushBackItem(lang.getString("Enabled"));
listBoxFogOfWar.pushBackItem(lang.getString("Explored")); listBoxFogOfWar.pushBackItem(lang.getString("Explored"));
listBoxFogOfWar.pushBackItem(lang.getString("Disabled")); listBoxFogOfWar.pushBackItem(lang.getString("Disabled"));
@ -325,11 +325,11 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
// Allow Observers // Allow Observers
labelAllowObservers.registerGraphicComponent(containerName,"labelAllowObservers"); labelAllowObservers.registerGraphicComponent(containerName,"labelAllowObservers");
labelAllowObservers.init(xoffset+310, aHeadPos, 80); labelAllowObservers.init(xoffset+325, aHeadPos, 80);
labelAllowObservers.setText(lang.getString("AllowObservers")); labelAllowObservers.setText(lang.getString("AllowObservers"));
checkBoxAllowObservers.registerGraphicComponent(containerName,"checkBoxAllowObservers"); checkBoxAllowObservers.registerGraphicComponent(containerName,"checkBoxAllowObservers");
checkBoxAllowObservers.init(xoffset+310, aPos); checkBoxAllowObservers.init(xoffset+325, aPos);
checkBoxAllowObservers.setValue(false); checkBoxAllowObservers.setValue(false);
vector<string> rMultiplier; vector<string> rMultiplier;
@ -338,44 +338,44 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
} }
labelFallbackCpuMultiplier.registerGraphicComponent(containerName,"labelFallbackCpuMultiplier"); labelFallbackCpuMultiplier.registerGraphicComponent(containerName,"labelFallbackCpuMultiplier");
labelFallbackCpuMultiplier.init(xoffset+460, aHeadPos, 80); labelFallbackCpuMultiplier.init(xoffset+500, aHeadPos, 80);
labelFallbackCpuMultiplier.setText(lang.getString("FallbackCpuMultiplier")); labelFallbackCpuMultiplier.setText(lang.getString("FallbackCpuMultiplier"));
listBoxFallbackCpuMultiplier.registerGraphicComponent(containerName,"listBoxFallbackCpuMultiplier"); listBoxFallbackCpuMultiplier.registerGraphicComponent(containerName,"listBoxFallbackCpuMultiplier");
listBoxFallbackCpuMultiplier.init(xoffset+460, aPos, 80); listBoxFallbackCpuMultiplier.init(xoffset+500, aPos, 80);
listBoxFallbackCpuMultiplier.setItems(rMultiplier); listBoxFallbackCpuMultiplier.setItems(rMultiplier);
listBoxFallbackCpuMultiplier.setSelectedItem("1.0"); listBoxFallbackCpuMultiplier.setSelectedItem("1.0");
// Allow Switch Team Mode // Allow Switch Team Mode
labelEnableSwitchTeamMode.registerGraphicComponent(containerName,"labelEnableSwitchTeamMode"); labelEnableSwitchTeamMode.registerGraphicComponent(containerName,"labelEnableSwitchTeamMode");
labelEnableSwitchTeamMode.init(xoffset+310, aHeadPos+45, 80); labelEnableSwitchTeamMode.init(xoffset+325, aHeadPos+45, 80);
labelEnableSwitchTeamMode.setText(lang.getString("EnableSwitchTeamMode")); labelEnableSwitchTeamMode.setText(lang.getString("EnableSwitchTeamMode"));
checkBoxEnableSwitchTeamMode.registerGraphicComponent(containerName,"checkBoxEnableSwitchTeamMode"); checkBoxEnableSwitchTeamMode.registerGraphicComponent(containerName,"checkBoxEnableSwitchTeamMode");
checkBoxEnableSwitchTeamMode.init(xoffset+310, aPos+45); checkBoxEnableSwitchTeamMode.init(xoffset+325, aPos+45);
checkBoxEnableSwitchTeamMode.setValue(false); checkBoxEnableSwitchTeamMode.setValue(false);
labelAISwitchTeamAcceptPercent.registerGraphicComponent(containerName,"labelAISwitchTeamAcceptPercent"); labelAISwitchTeamAcceptPercent.registerGraphicComponent(containerName,"labelAISwitchTeamAcceptPercent");
labelAISwitchTeamAcceptPercent.init(xoffset+460, aHeadPos+45, 80); labelAISwitchTeamAcceptPercent.init(xoffset+500, aHeadPos+45, 80);
labelAISwitchTeamAcceptPercent.setText(lang.getString("AISwitchTeamAcceptPercent")); labelAISwitchTeamAcceptPercent.setText(lang.getString("AISwitchTeamAcceptPercent"));
listBoxAISwitchTeamAcceptPercent.registerGraphicComponent(containerName,"listBoxAISwitchTeamAcceptPercent"); listBoxAISwitchTeamAcceptPercent.registerGraphicComponent(containerName,"listBoxAISwitchTeamAcceptPercent");
listBoxAISwitchTeamAcceptPercent.init(xoffset+460, aPos+45, 80); listBoxAISwitchTeamAcceptPercent.init(xoffset+500, aPos+45, 80);
for(int i = 0; i <= 100; i = i + 10) { for(int i = 0; i <= 100; i = i + 10) {
listBoxAISwitchTeamAcceptPercent.pushBackItem(intToStr(i)); listBoxAISwitchTeamAcceptPercent.pushBackItem(intToStr(i));
} }
listBoxAISwitchTeamAcceptPercent.setSelectedItem(intToStr(30)); listBoxAISwitchTeamAcceptPercent.setSelectedItem(intToStr(30));
labelAllowNativeLanguageTechtree.registerGraphicComponent(containerName,"labelAllowNativeLanguageTechtree"); labelAllowNativeLanguageTechtree.registerGraphicComponent(containerName,"labelAllowNativeLanguageTechtree");
labelAllowNativeLanguageTechtree.init(xoffset+650, mapHeadPos-50); labelAllowNativeLanguageTechtree.init(xoffset+700, aHeadPos+45);
labelAllowNativeLanguageTechtree.setText(lang.getString("AllowNativeLanguageTechtree")); labelAllowNativeLanguageTechtree.setText(lang.getString("AllowNativeLanguageTechtree"));
checkBoxAllowNativeLanguageTechtree.registerGraphicComponent(containerName,"checkBoxAllowNativeLanguageTechtree"); checkBoxAllowNativeLanguageTechtree.registerGraphicComponent(containerName,"checkBoxAllowNativeLanguageTechtree");
checkBoxAllowNativeLanguageTechtree.init(xoffset+650, mapHeadPos-70); checkBoxAllowNativeLanguageTechtree.init(xoffset+700, aPos+45);
checkBoxAllowNativeLanguageTechtree.setValue(false); checkBoxAllowNativeLanguageTechtree.setValue(false);
// Network Scenario // Network Scenario
int scenarioX=810; int scenarioX=800;
int scenarioY=140; int scenarioY=140;
labelScenario.registerGraphicComponent(containerName,"labelScenario"); labelScenario.registerGraphicComponent(containerName,"labelScenario");
labelScenario.init(scenarioX, scenarioY); labelScenario.init(scenarioX, scenarioY);
@ -431,11 +431,11 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
} }
// Advanced Options // Advanced Options
labelAdvanced.registerGraphicComponent(containerName,"labelAdvanced"); labelAdvanced.registerGraphicComponent(containerName,"labelAdvanced");
labelAdvanced.init(810, 80, 80); labelAdvanced.init(scenarioX, 80, 80);
labelAdvanced.setText(lang.getString("AdvancedGameOptions")); labelAdvanced.setText(lang.getString("AdvancedGameOptions"));
checkBoxAdvanced.registerGraphicComponent(containerName,"checkBoxAdvanced"); checkBoxAdvanced.registerGraphicComponent(containerName,"checkBoxAdvanced");
checkBoxAdvanced.init(810, 80-labelOffset); checkBoxAdvanced.init(scenarioX, 80-labelOffset);
checkBoxAdvanced.setValue(false); checkBoxAdvanced.setValue(false);
// network things // network things
@ -443,11 +443,11 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
xoffset=90; xoffset=90;
labelPublishServer.registerGraphicComponent(containerName,"labelPublishServer"); labelPublishServer.registerGraphicComponent(containerName,"labelPublishServer");
labelPublishServer.init(50, networkHeadPos, 100); labelPublishServer.init(20, networkHeadPos, 100);
labelPublishServer.setText(lang.getString("PublishServer")); labelPublishServer.setText(lang.getString("PublishServer"));
checkBoxPublishServer.registerGraphicComponent(containerName,"checkBoxPublishServer"); checkBoxPublishServer.registerGraphicComponent(containerName,"checkBoxPublishServer");
checkBoxPublishServer.init(50, networkPos); checkBoxPublishServer.init(20, networkPos);
checkBoxPublishServer.setValue(false); checkBoxPublishServer.setValue(false);
if((this->headlessServerMode == true || if((this->headlessServerMode == true ||
@ -457,7 +457,7 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
} }
labelGameName.registerGraphicComponent(containerName,"labelGameName"); labelGameName.registerGraphicComponent(containerName,"labelGameName");
labelGameName.init(50+checkBoxPublishServer.getW()+2, networkPos,200); labelGameName.init(20+checkBoxPublishServer.getW()+5, networkPos,200);
labelGameName.setFont(CoreData::getInstance().getMenuFontBig()); labelGameName.setFont(CoreData::getInstance().getMenuFontBig());
labelGameName.setFont3D(CoreData::getInstance().getMenuFontBig3D()); labelGameName.setFont3D(CoreData::getInstance().getMenuFontBig3D());
if(this->headlessServerMode == false) { if(this->headlessServerMode == false) {
@ -514,49 +514,49 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
checkBoxNetworkPauseGameForLaggedClients.setValue(true); checkBoxNetworkPauseGameForLaggedClients.setValue(true);
//list boxes //list boxes
xoffset=30; xoffset=5;
int rowHeight=27; int rowHeight=27;
for(int i=0; i<GameConstants::maxPlayers; ++i){ for(int i=0; i<GameConstants::maxPlayers; ++i){
labelPlayers[i].registerGraphicComponent(containerName,"labelPlayers" + intToStr(i)); labelPlayers[i].registerGraphicComponent(containerName,"labelPlayers" + intToStr(i));
labelPlayers[i].init(xoffset, setupPos-30-i*rowHeight+2); labelPlayers[i].init(xoffset, setupPos-30-i*rowHeight+2);
labelPlayers[i].setFont(CoreData::getInstance().getMenuFontBig()); labelPlayers[i].setFont(CoreData::getInstance().getMenuFontVeryBig());
labelPlayers[i].setFont3D(CoreData::getInstance().getMenuFontBig3D()); labelPlayers[i].setFont3D(CoreData::getInstance().getMenuFontVeryBig3D());
labelPlayerStatus[i].registerGraphicComponent(containerName,"labelPlayerStatus" + intToStr(i)); labelPlayerStatus[i].registerGraphicComponent(containerName,"labelPlayerStatus" + intToStr(i));
labelPlayerStatus[i].init(xoffset+15, setupPos-30-i*rowHeight+2, 60); labelPlayerStatus[i].init(xoffset+15, setupPos-30-i*rowHeight+2, 60);
labelPlayerNames[i].registerGraphicComponent(containerName,"labelPlayerNames" + intToStr(i)); labelPlayerNames[i].registerGraphicComponent(containerName,"labelPlayerNames" + intToStr(i));
labelPlayerNames[i].init(xoffset+30,setupPos-30-i*rowHeight); labelPlayerNames[i].init(xoffset+33,setupPos-30-i*rowHeight);
listBoxControls[i].registerGraphicComponent(containerName,"listBoxControls" + intToStr(i)); listBoxControls[i].registerGraphicComponent(containerName,"listBoxControls" + intToStr(i));
listBoxControls[i].init(xoffset+170, setupPos-30-i*rowHeight); listBoxControls[i].init(xoffset+170, setupPos-30-i*rowHeight, 170);
buttonBlockPlayers[i].registerGraphicComponent(containerName,"buttonBlockPlayers" + intToStr(i)); buttonBlockPlayers[i].registerGraphicComponent(containerName,"buttonBlockPlayers" + intToStr(i));
//buttonBlockPlayers[i].init(xoffset+355, setupPos-30-i*rowHeight, 70); //buttonBlockPlayers[i].init(xoffset+355, setupPos-30-i*rowHeight, 70);
buttonBlockPlayers[i].init(xoffset+210, setupPos-30-i*rowHeight, 70); buttonBlockPlayers[i].init(xoffset+195, setupPos-30-i*rowHeight, 120);
buttonBlockPlayers[i].setText(lang.getString("BlockPlayer")); buttonBlockPlayers[i].setText(lang.getString("BlockPlayer"));
buttonBlockPlayers[i].setFont(CoreData::getInstance().getDisplayFontSmall()); buttonBlockPlayers[i].setFont(CoreData::getInstance().getDisplayFontSmall());
buttonBlockPlayers[i].setFont3D(CoreData::getInstance().getDisplayFontSmall3D()); buttonBlockPlayers[i].setFont3D(CoreData::getInstance().getDisplayFontSmall3D());
listBoxRMultiplier[i].registerGraphicComponent(containerName,"listBoxRMultiplier" + intToStr(i)); listBoxRMultiplier[i].registerGraphicComponent(containerName,"listBoxRMultiplier" + intToStr(i));
listBoxRMultiplier[i].init(xoffset+310, setupPos-30-i*rowHeight,70); listBoxRMultiplier[i].init(xoffset+342, setupPos-30-i*rowHeight,68);
listBoxFactions[i].registerGraphicComponent(containerName,"listBoxFactions" + intToStr(i)); listBoxFactions[i].registerGraphicComponent(containerName,"listBoxFactions" + intToStr(i));
listBoxFactions[i].init(xoffset+390, setupPos-30-i*rowHeight, 250); listBoxFactions[i].init(xoffset+415, setupPos-30-i*rowHeight, 250);
listBoxFactions[i].setLeftControlled(true); listBoxFactions[i].setLeftControlled(true);
listBoxTeams[i].registerGraphicComponent(containerName,"listBoxTeams" + intToStr(i)); listBoxTeams[i].registerGraphicComponent(containerName,"listBoxTeams" + intToStr(i));
listBoxTeams[i].init(xoffset+650, setupPos-30-i*rowHeight, 60); listBoxTeams[i].init(xoffset+667, setupPos-30-i*rowHeight, 60);
listBoxTeams[i].setLighted(true); listBoxTeams[i].setLighted(true);
labelNetStatus[i].registerGraphicComponent(containerName,"labelNetStatus" + intToStr(i)); labelNetStatus[i].registerGraphicComponent(containerName,"labelNetStatus" + intToStr(i));
labelNetStatus[i].init(xoffset+715, setupPos-30-i*rowHeight, 60); labelNetStatus[i].init(xoffset+733, setupPos-30-i*rowHeight, 60);
labelNetStatus[i].setFont(CoreData::getInstance().getDisplayFontSmall()); labelNetStatus[i].setFont(CoreData::getInstance().getDisplayFontSmall());
labelNetStatus[i].setFont3D(CoreData::getInstance().getDisplayFontSmall3D()); labelNetStatus[i].setFont3D(CoreData::getInstance().getDisplayFontSmall3D());
} }
buttonClearBlockedPlayers.registerGraphicComponent(containerName,"buttonClearBlockedPlayers"); buttonClearBlockedPlayers.registerGraphicComponent(containerName,"buttonClearBlockedPlayers");
buttonClearBlockedPlayers.init(xoffset+170, setupPos-30-8*rowHeight, 140); buttonClearBlockedPlayers.init(xoffset+170, setupPos-30-8*rowHeight, 170+2+68);
labelControl.registerGraphicComponent(containerName,"labelControl"); labelControl.registerGraphicComponent(containerName,"labelControl");
labelControl.init(xoffset+170, setupPos, GraphicListBox::defW, GraphicListBox::defH, true); labelControl.init(xoffset+170, setupPos, GraphicListBox::defW, GraphicListBox::defH, true);
@ -768,9 +768,9 @@ void MenuStateCustomGame::reloadUI() {
labelLocalIP.setText(lang.getString("LanIP") + ipText + " ( "+serverPort+" / "+externalPort+" )"); labelLocalIP.setText(lang.getString("LanIP") + ipText + " ( "+serverPort+" / "+externalPort+" )");
labelMap.setText(lang.getString("Map")+":"); labelMap.setText(lang.getString("Map"));
labelMapFilter.setText(lang.getString("MapFilter")+":"); labelMapFilter.setText(lang.getString("MapFilter"));
labelTileset.setText(lang.getString("Tileset")); labelTileset.setText(lang.getString("Tileset"));