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

- bugfix to close unconnected network slots if they are in a slot higher than map's max slots

Browse Source
This commit is contained in:
Mark Vejvoda 2012-07-27 00:39:13 +00:00
parent 194e1868b9
commit 0e0c43f14a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3762,7 +3762,8 @@ void MenuStateCustomGame::closeUnusedSlots(){
try { try {
if(checkBoxScenario.getValue() == false) { if(checkBoxScenario.getValue() == false) {
ServerInterface* serverInterface= NetworkManager::getInstance().getServerInterface(); ServerInterface* serverInterface= NetworkManager::getInstance().getServerInterface();
for(int i= 0; i<mapInfo.players; ++i){ //for(int i= 0; i<mapInfo.players; ++i){
for(int i= 0; i < GameConstants::maxPlayers; ++i){
if(listBoxControls[i].getSelectedItemIndex() == ctNetwork || if(listBoxControls[i].getSelectedItemIndex() == ctNetwork ||
listBoxControls[i].getSelectedItemIndex() == ctNetworkUnassigned) { listBoxControls[i].getSelectedItemIndex() == ctNetworkUnassigned) {
if(serverInterface->getSlot(i) == NULL || if(serverInterface->getSlot(i) == NULL ||
@ -3800,7 +3801,10 @@ void MenuStateCustomGame::updateNetworkSlots() {
} }
for(int i= 0; i < GameConstants::maxPlayers; ++i) { for(int i= 0; i < GameConstants::maxPlayers; ++i) {
if(serverInterface->getSlot(i) == NULL && ConnectionSlot *slot = serverInterface->getSlot(i);
//printf("A i = %d control type = %d slot [%p]\n",i,listBoxControls[i].getSelectedItemIndex(),slot);
if(slot == NULL &&
listBoxControls[i].getSelectedItemIndex() == ctNetwork) { listBoxControls[i].getSelectedItemIndex() == ctNetwork) {
try { try {
serverInterface->addSlot(i); serverInterface->addSlot(i);
@ -3822,9 +3826,11 @@ void MenuStateCustomGame::updateNetworkSlots() {
listBoxControls[i].setSelectedItemIndex(ctCpu); listBoxControls[i].setSelectedItemIndex(ctCpu);
} }
} }
ConnectionSlot *slot = serverInterface->getSlot(i); slot = serverInterface->getSlot(i);
if(slot != NULL) { if(slot != NULL) {
if(listBoxControls[i].getSelectedItemIndex() != ctNetwork) { if((listBoxControls[i].getSelectedItemIndex() != ctNetwork) ||
(listBoxControls[i].getSelectedItemIndex() == ctNetwork &&
slot->isConnected() == false && i >= mapInfo.players)) {
if(slot->getCanAcceptConnections() == true) { if(slot->getCanAcceptConnections() == true) {
slot->setCanAcceptConnections(false); slot->setCanAcceptConnections(false);
} }