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

- bugfixes for lobby UI when map changes and player index is invalid

Browse Source
This commit is contained in:
Mark Vejvoda 2011-09-02 00:08:35 +00:00
parent 0a2c929fea
commit e44170ea00
3 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/glest_game/game/game_settings.h
View File

@ -158,7 +158,7 @@ public:
bool isNetworkGame() const { bool isNetworkGame() const {
bool result = false; bool result = false;
for(int idx = 0; idx < GameConstants::maxPlayers; ++idx) { for(int idx = 0; idx < GameConstants::maxPlayers; ++idx) {
if(factionControls[idx] == ctNetwork) { if(factionControls[idx] == ctNetwork || factionControls[idx] == ctNetworkUnassigned) {
result = true; result = true;
break; break;
} }

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

@ -1808,7 +1808,7 @@ void MenuStateConnectedGame::update() {
listBoxNetworkFramePeriod.setSelectedItem(intToStr(gameSettings->getNetworkFramePeriod()),false); listBoxNetworkFramePeriod.setSelectedItem(intToStr(gameSettings->getNetworkFramePeriod()),false);
// Control // Control
for(int i=0; i<GameConstants::maxPlayers; ++i){ for(int i=0; i<GameConstants::maxPlayers; ++i) {
listBoxControls[i].setSelectedItemIndex(ctClosed); listBoxControls[i].setSelectedItemIndex(ctClosed);
listBoxFactions[i].setEditable(false); listBoxFactions[i].setEditable(false);
listBoxTeams[i].setEditable(false); listBoxTeams[i].setEditable(false);
@ -1817,11 +1817,33 @@ void MenuStateConnectedGame::update() {
} }
if(hasFactions == true && gameSettings != NULL) { if(hasFactions == true && gameSettings != NULL) {
for(int i=0; i < gameSettings->getFactionCount(); ++i){ NetworkManager &networkManager= NetworkManager::getInstance();
ClientInterface *clientInterface = networkManager.getClientInterface();
//for(int i=0; i < gameSettings->getFactionCount(); ++i){
for(int i=0; i < GameConstants::maxPlayers; ++i) {
int slot = gameSettings->getStartLocationIndex(i); int slot = gameSettings->getStartLocationIndex(i);
//printf("Control = %d\n",gameSettings->getFactionControl(i));
// if(gameSettings->getFactionControl(i) == ctNetworkUnassigned) {
// printf("#1 Index = %d, Control = %d, Count = %d, slot = %d, gameSettings->getThisFactionIndex() = %d\n",i,gameSettings->getFactionControl(i),gameSettings->getFactionCount(),slot,gameSettings->getThisFactionIndex());
// }
if(i >= gameSettings->getFactionCount()) {
if( gameSettings->getFactionControl(i) != ctNetworkUnassigned) {
continue;
}
else if(clientInterface->getPlayerIndex() != i) {
continue;
}
}
// if(gameSettings->getFactionControl(i) == ctNetworkUnassigned) {
// printf("#2 Index = %d, Control = %d, Count = %d, slot = %d, gameSettings->getThisFactionIndex() = %d\n",i,gameSettings->getFactionControl(i),gameSettings->getFactionCount(),slot,gameSettings->getThisFactionIndex());
// }
if( gameSettings->getFactionControl(i) == ctNetwork || if( gameSettings->getFactionControl(i) == ctNetwork ||
//gameSettings->getFactionControl(i) == ctNetworkUnassigned || gameSettings->getFactionControl(i) == ctNetworkUnassigned ||
gameSettings->getFactionControl(i) == ctHuman) { gameSettings->getFactionControl(i) == ctHuman) {
switch(gameSettings->getNetworkPlayerStatuses(i)) { switch(gameSettings->getNetworkPlayerStatuses(i)) {
case npst_BeRightBack: case npst_BeRightBack:
@ -1847,8 +1869,8 @@ void MenuStateConnectedGame::update() {
listBoxTeams[slot].setSelectedItemIndex(gameSettings->getTeam(i),errorOnMissingData); listBoxTeams[slot].setSelectedItemIndex(gameSettings->getTeam(i),errorOnMissingData);
//listBoxFactions[slot].setSelectedItem(formatString(gameSettings->getFactionTypeName(i)),errorOnMissingData); //listBoxFactions[slot].setSelectedItem(formatString(gameSettings->getFactionTypeName(i)),errorOnMissingData);
listBoxFactions[slot].setSelectedItem(formatString(gameSettings->getFactionTypeName(i)),false); listBoxFactions[slot].setSelectedItem(formatString(gameSettings->getFactionTypeName(i)),false);
if( gameSettings->getFactionControl(i) == ctNetwork) { if( gameSettings->getFactionControl(i) == ctNetwork ||
//gameSettings->getFactionControl(i) == ctNetworkUnassigned) { gameSettings->getFactionControl(i) == ctNetworkUnassigned) {
labelNetStatus[slot].setText(gameSettings->getNetworkPlayerName(i)); labelNetStatus[slot].setText(gameSettings->getNetworkPlayerName(i));
if( gameSettings->getThisFactionIndex() != i && if( gameSettings->getThisFactionIndex() != i &&
gameSettings->getNetworkPlayerName(i) != "" && gameSettings->getNetworkPlayerName(i) != "" &&
@ -1858,7 +1880,7 @@ void MenuStateConnectedGame::update() {
} }
ControlType ct= gameSettings->getFactionControl(i); ControlType ct= gameSettings->getFactionControl(i);
if (ct == ctHuman || ct == ctNetwork || ct == ctNetworkUnassigned || ct == ctClosed) { if (ct == ctHuman || ct == ctNetwork || ct == ctClosed) {
listBoxRMultiplier[slot].setEnabled(false); listBoxRMultiplier[slot].setEnabled(false);
listBoxRMultiplier[slot].setVisible(false); listBoxRMultiplier[slot].setVisible(false);
} else { } else {
@ -1869,8 +1891,11 @@ void MenuStateConnectedGame::update() {
if((gameSettings->getFactionControl(i) == ctNetwork || if((gameSettings->getFactionControl(i) == ctNetwork ||
gameSettings->getFactionControl(i) == ctNetworkUnassigned) && gameSettings->getFactionControl(i) == ctNetworkUnassigned) &&
gameSettings->getThisFactionIndex() == i) { gameSettings->getThisFactionIndex() == i) {
// set my current slot to ctHuman // set my current slot to ctHuman
listBoxControls[slot].setSelectedItemIndex(ctHuman); if(gameSettings->getFactionControl(i) != ctNetworkUnassigned) {
listBoxControls[slot].setSelectedItemIndex(ctHuman);
}
listBoxFactions[slot].setEditable(true); listBoxFactions[slot].setEditable(true);
listBoxTeams[slot].setEditable(true); listBoxTeams[slot].setEditable(true);

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

@ -1541,7 +1541,7 @@ void MenuStateCustomGame::switchSetupForSlots(SwitchSetupRequest **switchSetupRe
} }
if(listBoxControls[switchFactionIdx].getSelectedItemIndex() == ctNetworkUnassigned) { if(listBoxControls[switchFactionIdx].getSelectedItemIndex() == ctNetworkUnassigned) {
serverInterface->removeSlot(i); serverInterface->removeSlot(switchFactionIdx);
listBoxControls[switchFactionIdx].setSelectedItemIndex(ctClosed); listBoxControls[switchFactionIdx].setSelectedItemIndex(ctClosed);
labelPlayers[switchFactionIdx].setVisible(switchFactionIdx+1 <= mapInfo.players); labelPlayers[switchFactionIdx].setVisible(switchFactionIdx+1 <= mapInfo.players);