- added new option to UI to Show Resources for custom games
This commit is contained in:
parent
f204d4445c
commit
e9c8928b49
|
@ -251,6 +251,16 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, b
|
||||||
listBoxAllowObservers.pushBackItem(lang.get("Yes"));
|
listBoxAllowObservers.pushBackItem(lang.get("Yes"));
|
||||||
listBoxAllowObservers.setSelectedItemIndex(0);
|
listBoxAllowObservers.setSelectedItemIndex(0);
|
||||||
|
|
||||||
|
labelShowMapResources.registerGraphicComponent(containerName,"labelShowMapResources;");
|
||||||
|
labelShowMapResources.init(xoffset+200, aHeadPos, 80);
|
||||||
|
labelShowMapResources.setText(lang.get("ShowMapResources"));
|
||||||
|
|
||||||
|
listBoxShowMapResources.registerGraphicComponent(containerName,"listBoxShowMapResources;");
|
||||||
|
listBoxShowMapResources.init(xoffset+200, aPos, 80);
|
||||||
|
listBoxShowMapResources.pushBackItem(lang.get("No"));
|
||||||
|
listBoxShowMapResources.pushBackItem(lang.get("Yes"));
|
||||||
|
listBoxShowMapResources.setSelectedItemIndex(0);
|
||||||
|
|
||||||
// fog - o - war
|
// fog - o - war
|
||||||
// @350 ? 300 ?
|
// @350 ? 300 ?
|
||||||
labelFogOfWar.registerGraphicComponent(containerName,"labelFogOfWar");
|
labelFogOfWar.registerGraphicComponent(containerName,"labelFogOfWar");
|
||||||
|
@ -684,8 +694,19 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
|
||||||
|
|
||||||
reloadFactions(true);
|
reloadFactions(true);
|
||||||
|
|
||||||
if(hasNetworkGameSettings() == true)
|
if(hasNetworkGameSettings() == true) {
|
||||||
{
|
needToSetChangedGameSettings = true;
|
||||||
|
lastSetChangedGameSettings = time(NULL);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (listBoxAdvanced.getSelectedItemIndex() == 1 && listBoxShowMapResources.mouseClick(x, y)) {
|
||||||
|
MutexSafeWrapper safeMutex(&masterServerThreadAccessor);
|
||||||
|
|
||||||
|
if(listBoxPublishServer.getSelectedItemIndex() == 0) {
|
||||||
|
needToRepublishToMasterserver = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(hasNetworkGameSettings() == true) {
|
||||||
needToSetChangedGameSettings = true;
|
needToSetChangedGameSettings = true;
|
||||||
lastSetChangedGameSettings = time(NULL);
|
lastSetChangedGameSettings = time(NULL);
|
||||||
}
|
}
|
||||||
|
@ -1182,6 +1203,7 @@ void MenuStateCustomGame::mouseMove(int x, int y, const MouseState *ms){
|
||||||
listBoxFogOfWar.mouseMove(x, y);
|
listBoxFogOfWar.mouseMove(x, y);
|
||||||
listBoxAllowObservers.mouseMove(x, y);
|
listBoxAllowObservers.mouseMove(x, y);
|
||||||
listBoxEnableObserverMode.mouseMove(x, y);
|
listBoxEnableObserverMode.mouseMove(x, y);
|
||||||
|
listBoxShowMapResources.mouseMove(x, y);
|
||||||
//listBoxEnableServerControlledAI.mouseMove(x, y);
|
//listBoxEnableServerControlledAI.mouseMove(x, y);
|
||||||
//labelNetworkFramePeriod.mouseMove(x, y);
|
//labelNetworkFramePeriod.mouseMove(x, y);
|
||||||
//listBoxNetworkFramePeriod.mouseMove(x, y);
|
//listBoxNetworkFramePeriod.mouseMove(x, y);
|
||||||
|
@ -1286,11 +1308,13 @@ void MenuStateCustomGame::render() {
|
||||||
if(listBoxAdvanced.getSelectedItemIndex() == 1) {
|
if(listBoxAdvanced.getSelectedItemIndex() == 1) {
|
||||||
renderer.renderLabel(&labelFogOfWar);
|
renderer.renderLabel(&labelFogOfWar);
|
||||||
renderer.renderLabel(&labelAllowObservers);
|
renderer.renderLabel(&labelAllowObservers);
|
||||||
|
renderer.renderLabel(&labelShowMapResources);
|
||||||
renderer.renderLabel(&labelEnableObserverMode);
|
renderer.renderLabel(&labelEnableObserverMode);
|
||||||
renderer.renderLabel(&labelPathFinderType);
|
renderer.renderLabel(&labelPathFinderType);
|
||||||
|
|
||||||
renderer.renderListBox(&listBoxFogOfWar);
|
renderer.renderListBox(&listBoxFogOfWar);
|
||||||
renderer.renderListBox(&listBoxAllowObservers);
|
renderer.renderListBox(&listBoxAllowObservers);
|
||||||
|
renderer.renderListBox(&listBoxShowMapResources);
|
||||||
renderer.renderListBox(&listBoxEnableObserverMode);
|
renderer.renderListBox(&listBoxEnableObserverMode);
|
||||||
renderer.renderListBox(&listBoxPathFinderType);
|
renderer.renderListBox(&listBoxPathFinderType);
|
||||||
}
|
}
|
||||||
|
@ -1981,6 +2005,16 @@ void MenuStateCustomGame::loadGameSettings(GameSettings *gameSettings) {
|
||||||
|
|
||||||
gameSettings->setAllowObservers(listBoxAllowObservers.getSelectedItemIndex() == 1);
|
gameSettings->setAllowObservers(listBoxAllowObservers.getSelectedItemIndex() == 1);
|
||||||
|
|
||||||
|
uint32 valueFlags1 = gameSettings->getFlagTypes1();
|
||||||
|
if(listBoxShowMapResources.getSelectedItemIndex() == 1) {
|
||||||
|
valueFlags1 |= ft1_show_map_resources;
|
||||||
|
gameSettings->setFlagTypes1(valueFlags1);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
valueFlags1 &= ~ft1_show_map_resources;
|
||||||
|
gameSettings->setFlagTypes1(valueFlags1);
|
||||||
|
}
|
||||||
|
|
||||||
gameSettings->setEnableObserverModeAtEndGame(listBoxEnableObserverMode.getSelectedItemIndex() == 0);
|
gameSettings->setEnableObserverModeAtEndGame(listBoxEnableObserverMode.getSelectedItemIndex() == 0);
|
||||||
gameSettings->setPathFinderType(static_cast<PathFinderType>(listBoxPathFinderType.getSelectedItemIndex()));
|
gameSettings->setPathFinderType(static_cast<PathFinderType>(listBoxPathFinderType.getSelectedItemIndex()));
|
||||||
|
|
||||||
|
@ -2128,6 +2162,8 @@ void MenuStateCustomGame::saveGameSettingsToFile(std::string fileName) {
|
||||||
|
|
||||||
saveGameFile << "AllowObservers=" << gameSettings.getAllowObservers() << std::endl;
|
saveGameFile << "AllowObservers=" << gameSettings.getAllowObservers() << std::endl;
|
||||||
|
|
||||||
|
saveGameFile << "FlagTypes1=" << gameSettings.getFlagTypes1() << std::endl;
|
||||||
|
|
||||||
saveGameFile << "EnableObserverModeAtEndGame=" << gameSettings.getEnableObserverModeAtEndGame() << std::endl;
|
saveGameFile << "EnableObserverModeAtEndGame=" << gameSettings.getEnableObserverModeAtEndGame() << std::endl;
|
||||||
saveGameFile << "PathFinderType=" << gameSettings.getPathFinderType() << std::endl;
|
saveGameFile << "PathFinderType=" << gameSettings.getPathFinderType() << std::endl;
|
||||||
saveGameFile << "EnableServerControlledAI=" << gameSettings.getEnableServerControlledAI() << std::endl;
|
saveGameFile << "EnableServerControlledAI=" << gameSettings.getEnableServerControlledAI() << std::endl;
|
||||||
|
@ -2186,6 +2222,8 @@ GameSettings MenuStateCustomGame::loadGameSettingsFromFile(std::string fileName)
|
||||||
|
|
||||||
gameSettings.setAllowObservers(properties.getBool("AllowObservers","false"));
|
gameSettings.setAllowObservers(properties.getBool("AllowObservers","false"));
|
||||||
|
|
||||||
|
gameSettings.setFlagTypes1(properties.getInt("FlagTypes1","0"));
|
||||||
|
|
||||||
gameSettings.setEnableObserverModeAtEndGame(properties.getBool("EnableObserverModeAtEndGame"));
|
gameSettings.setEnableObserverModeAtEndGame(properties.getBool("EnableObserverModeAtEndGame"));
|
||||||
gameSettings.setPathFinderType(static_cast<PathFinderType>(properties.getInt("PathFinderType",intToStr(pfBasic).c_str())));
|
gameSettings.setPathFinderType(static_cast<PathFinderType>(properties.getInt("PathFinderType",intToStr(pfBasic).c_str())));
|
||||||
gameSettings.setEnableServerControlledAI(properties.getBool("EnableServerControlledAI","true"));
|
gameSettings.setEnableServerControlledAI(properties.getBool("EnableServerControlledAI","true"));
|
||||||
|
@ -2245,6 +2283,8 @@ GameSettings MenuStateCustomGame::loadGameSettingsFromFile(std::string fileName)
|
||||||
listBoxFogOfWar.setSelectedItem(gameSettings.getFogOfWar() == true ? lang.get("Yes") : lang.get("No"));
|
listBoxFogOfWar.setSelectedItem(gameSettings.getFogOfWar() == true ? lang.get("Yes") : lang.get("No"));
|
||||||
listBoxAllowObservers.setSelectedItem(gameSettings.getAllowObservers() == true ? lang.get("Yes") : lang.get("No"));
|
listBoxAllowObservers.setSelectedItem(gameSettings.getAllowObservers() == true ? lang.get("Yes") : lang.get("No"));
|
||||||
|
|
||||||
|
listBoxShowMapResources.setSelectedItem((gameSettings.getFlagTypes1() & ft1_show_map_resources) == ft1_show_map_resources ? lang.get("Yes") : lang.get("No"));
|
||||||
|
|
||||||
listBoxEnableObserverMode.setSelectedItem(gameSettings.getEnableObserverModeAtEndGame() == true ? lang.get("Yes") : lang.get("No"));
|
listBoxEnableObserverMode.setSelectedItem(gameSettings.getEnableObserverModeAtEndGame() == true ? lang.get("Yes") : lang.get("No"));
|
||||||
listBoxPathFinderType.setSelectedItemIndex(gameSettings.getPathFinderType());
|
listBoxPathFinderType.setSelectedItemIndex(gameSettings.getPathFinderType());
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@ private:
|
||||||
GraphicLabel labelEnableObserverMode;
|
GraphicLabel labelEnableObserverMode;
|
||||||
//GraphicLabel labelEnableServerControlledAI;
|
//GraphicLabel labelEnableServerControlledAI;
|
||||||
GraphicLabel labelLocalIP;
|
GraphicLabel labelLocalIP;
|
||||||
|
|
||||||
|
|
||||||
GraphicListBox listBoxMap;
|
GraphicListBox listBoxMap;
|
||||||
GraphicListBox listBoxFogOfWar;
|
GraphicListBox listBoxFogOfWar;
|
||||||
|
@ -66,31 +66,34 @@ private:
|
||||||
GraphicListBox listBoxTeams[GameConstants::maxPlayers];
|
GraphicListBox listBoxTeams[GameConstants::maxPlayers];
|
||||||
GraphicLabel labelNetStatus[GameConstants::maxPlayers];
|
GraphicLabel labelNetStatus[GameConstants::maxPlayers];
|
||||||
MapInfo mapInfo;
|
MapInfo mapInfo;
|
||||||
|
|
||||||
GraphicLabel labelPublishServer;
|
GraphicLabel labelPublishServer;
|
||||||
GraphicListBox listBoxPublishServer;
|
GraphicListBox listBoxPublishServer;
|
||||||
|
|
||||||
GraphicMessageBox mainMessageBox;
|
GraphicMessageBox mainMessageBox;
|
||||||
int mainMessageBoxState;
|
int mainMessageBoxState;
|
||||||
|
|
||||||
//GraphicListBox listBoxNetworkFramePeriod;
|
//GraphicListBox listBoxNetworkFramePeriod;
|
||||||
//GraphicLabel labelNetworkFramePeriod;
|
//GraphicLabel labelNetworkFramePeriod;
|
||||||
|
|
||||||
GraphicLabel labelNetworkPauseGameForLaggedClients;
|
GraphicLabel labelNetworkPauseGameForLaggedClients;
|
||||||
GraphicListBox listBoxNetworkPauseGameForLaggedClients;
|
GraphicListBox listBoxNetworkPauseGameForLaggedClients;
|
||||||
|
|
||||||
GraphicLabel labelPathFinderType;
|
GraphicLabel labelPathFinderType;
|
||||||
GraphicListBox listBoxPathFinderType;
|
GraphicListBox listBoxPathFinderType;
|
||||||
|
|
||||||
GraphicLabel labelMapFilter;
|
GraphicLabel labelMapFilter;
|
||||||
GraphicListBox listBoxMapFilter;
|
GraphicListBox listBoxMapFilter;
|
||||||
|
|
||||||
GraphicLabel labelAdvanced;
|
GraphicLabel labelAdvanced;
|
||||||
GraphicListBox listBoxAdvanced;
|
GraphicListBox listBoxAdvanced;
|
||||||
|
|
||||||
GraphicLabel labelAllowObservers;
|
GraphicLabel labelAllowObservers;
|
||||||
GraphicListBox listBoxAllowObservers;
|
GraphicListBox listBoxAllowObservers;
|
||||||
|
|
||||||
|
GraphicLabel labelShowMapResources;
|
||||||
|
GraphicListBox listBoxShowMapResources;
|
||||||
|
|
||||||
GraphicLabel *activeInputLabel;
|
GraphicLabel *activeInputLabel;
|
||||||
|
|
||||||
bool needToSetChangedGameSettings;
|
bool needToSetChangedGameSettings;
|
||||||
|
@ -105,17 +108,17 @@ private:
|
||||||
Mutex masterServerThreadAccessor;
|
Mutex masterServerThreadAccessor;
|
||||||
Mutex publishToMasterserverThreadPtrChangeAccessor;
|
Mutex publishToMasterserverThreadPtrChangeAccessor;
|
||||||
bool publishToMasterserverThreadInDeletion;
|
bool publishToMasterserverThreadInDeletion;
|
||||||
|
|
||||||
bool parentMenuIsMs;
|
bool parentMenuIsMs;
|
||||||
int soundConnectionCount;
|
int soundConnectionCount;
|
||||||
|
|
||||||
bool showMasterserverError;
|
bool showMasterserverError;
|
||||||
string masterServererErrorToShow;
|
string masterServererErrorToShow;
|
||||||
|
|
||||||
bool showGeneralError;
|
bool showGeneralError;
|
||||||
string generalErrorToShow;
|
string generalErrorToShow;
|
||||||
bool serverInitError;
|
bool serverInitError;
|
||||||
|
|
||||||
Console console;
|
Console console;
|
||||||
ChatManager chatManager;
|
ChatManager chatManager;
|
||||||
bool showFullConsole;
|
bool showFullConsole;
|
||||||
|
@ -154,7 +157,7 @@ public:
|
||||||
virtual void keyDown(char key);
|
virtual void keyDown(char key);
|
||||||
virtual void keyPress(char c);
|
virtual void keyPress(char c);
|
||||||
virtual void keyUp(char key);
|
virtual void keyUp(char key);
|
||||||
|
|
||||||
|
|
||||||
virtual void simpleTask();
|
virtual void simpleTask();
|
||||||
virtual bool isInSpecialKeyCaptureEvent() { return chatManager.getEditEnabled(); }
|
virtual bool isInSpecialKeyCaptureEvent() { return chatManager.getEditEnabled(); }
|
||||||
|
|
Loading…
Reference in New Issue
Block a user