mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-31 19:51:44 +02:00
Code Issues Projects Releases Wiki Activity

client slot selection bug hopefully fixed

Browse Source
This commit is contained in:
Titus Tscharntke
2010-04-30 18:36:38 +00:00
parent c53ff62c46
commit 3e7f3ed485
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,22 +200,6 @@ void MenuStateConnectedGame::mouseClick(int x, int y, MouseButton mouseButton){
soundRenderer.playFx(coreData.getClickSoundC()); soundRenderer.playFx(coreData.getClickSoundC());
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
} }
else if(listBoxMap.mouseClick(x, y)){
}
else if (listBoxFogOfWar.mouseClick(x, y)) {
}
else if(listBoxTileset.mouseClick(x, y)){
}
else if(listBoxTechTree.mouseClick(x, y)){
//reloadFactions();
if(hasNetworkGameSettings() == true)
{
needToSetChangedGameSettings = true;
lastSetChangedGameSettings = time(NULL);;
}
}
else else
{ {
int myCurrentIndex=-1; int myCurrentIndex=-1;

2
source/glest_game/network/server_interface.cpp
View File

@@ -86,12 +86,14 @@ bool ServerInterface::switchSlot(int fromPlayerIndex,int toPlayerIndex){
if( !slots[toPlayerIndex]->isConnected()) { if( !slots[toPlayerIndex]->isConnected()) {
//printf(" yes, its free :)\n"); //printf(" yes, its free :)\n");
slots[fromPlayerIndex]->setPlayerIndex(toPlayerIndex); slots[fromPlayerIndex]->setPlayerIndex(toPlayerIndex);
slots[toPlayerIndex]->setPlayerIndex(fromPlayerIndex);
ConnectionSlot *tmp=slots[toPlayerIndex]; ConnectionSlot *tmp=slots[toPlayerIndex];
slots[toPlayerIndex]= slots[fromPlayerIndex]; slots[toPlayerIndex]= slots[fromPlayerIndex];
slots[fromPlayerIndex]=tmp; slots[fromPlayerIndex]=tmp;
PlayerIndexMessage playerIndexMessage(toPlayerIndex); PlayerIndexMessage playerIndexMessage(toPlayerIndex);
slots[toPlayerIndex]->sendMessage(&playerIndexMessage); slots[toPlayerIndex]->sendMessage(&playerIndexMessage);
result=true; result=true;
updateListen();
} }
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s] END\n",__FILE__,__FUNCTION__); SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s] END\n",__FILE__,__FUNCTION__);
return result; return result;