diff --git a/source/glest_game/gui/gui.cpp b/source/glest_game/gui/gui.cpp index 626ec90c..ae764d51 100644 --- a/source/glest_game/gui/gui.cpp +++ b/source/glest_game/gui/gui.cpp @@ -922,7 +922,7 @@ void Gui::computeSelected(bool doubleClick, bool force){ Renderer::getInstance().computeSelected(units, selectedResourceObject, true, selectionQuad.getPosDown(), selectionQuad.getPosDown()); } else{ - Renderer::getInstance().computeSelected(units, selectedResourceObject, true, selectionQuad.getPosDown(), selectionQuad.getPosUp()); + Renderer::getInstance().computeSelected(units, selectedResourceObject, false, selectionQuad.getPosDown(), selectionQuad.getPosUp()); } selectingBuilding= false; activeCommandType= NULL; diff --git a/source/glest_game/menu/server_line.cpp b/source/glest_game/menu/server_line.cpp index 5e510fec..91198876 100644 --- a/source/glest_game/menu/server_line.cpp +++ b/source/glest_game/menu/server_line.cpp @@ -130,11 +130,6 @@ ServerLine::ServerLine( MasterServerInfo *mServerInfo, int lineIndex, int baseY, selectButton.setEnabled(compatible); selectButton.setEditable(compatible); - gameFull.init(i, baseY-lineOffset); - gameFull.setText(lang.get("MGGameSlotsFull")); - gameFull.setEnabled(!compatible); - gameFull.setEditable(!compatible); - } ServerLine::~ServerLine() { @@ -168,20 +163,11 @@ void ServerLine::render() { if(joinEnabled == true) { selectButton.setEnabled(true); selectButton.setVisible(true); - - gameFull.setEnabled(false); - gameFull.setEditable(false); - renderer.renderButton(&selectButton); } else { selectButton.setEnabled(false); selectButton.setVisible(false); - - gameFull.setEnabled(true); - gameFull.setEditable(true); - - renderer.renderLabel(&gameFull); } //general info: @@ -200,7 +186,7 @@ void ServerLine::render() { if (compatible) { renderer.renderLabel(&status); } - if(gameFull.getEnabled() == false) { + if(selectButton.getEnabled() == true) { if (compatible) { //renderer.renderLabel(&ipAddressLabel); @@ -221,7 +207,6 @@ void ServerLine::render() { void ServerLine::setY(int y) { selectButton.setY(y); - gameFull.setY(y); //general info: glestVersionLabel.setY(y); diff --git a/source/glest_game/menu/server_line.h b/source/glest_game/menu/server_line.h index 76e9f65f..ed2d89fe 100644 --- a/source/glest_game/menu/server_line.h +++ b/source/glest_game/menu/server_line.h @@ -33,7 +33,6 @@ private: int baseY; bool compatible; GraphicButton selectButton; - GraphicLabel gameFull; GraphicLabel wrongVersionLabel; //general info: