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

status of serverline display fix / ressources are no longer selectable via rectangle ( which was quite useless )

Browse Source
This commit is contained in:
Titus Tscharntke 2011-02-15 00:24:31 +00:00
parent a214fa87f5
commit 01db66105e
3 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/glest_game/gui/gui.cpp
View File

@ -922,7 +922,7 @@ void Gui::computeSelected(bool doubleClick, bool force){
Renderer::getInstance().computeSelected(units, selectedResourceObject, true, selectionQuad.getPosDown(), selectionQuad.getPosDown()); Renderer::getInstance().computeSelected(units, selectedResourceObject, true, selectionQuad.getPosDown(), selectionQuad.getPosDown());
} }
else{ else{
Renderer::getInstance().computeSelected(units, selectedResourceObject, true, selectionQuad.getPosDown(), selectionQuad.getPosUp()); Renderer::getInstance().computeSelected(units, selectedResourceObject, false, selectionQuad.getPosDown(), selectionQuad.getPosUp());
} }
selectingBuilding= false; selectingBuilding= false;
activeCommandType= NULL; activeCommandType= NULL;

17
source/glest_game/menu/server_line.cpp
View File

@ -130,11 +130,6 @@ ServerLine::ServerLine( MasterServerInfo *mServerInfo, int lineIndex, int baseY,
selectButton.setEnabled(compatible); selectButton.setEnabled(compatible);
selectButton.setEditable(compatible); selectButton.setEditable(compatible);
gameFull.init(i, baseY-lineOffset);
gameFull.setText(lang.get("MGGameSlotsFull"));
gameFull.setEnabled(!compatible);
gameFull.setEditable(!compatible);
} }
ServerLine::~ServerLine() { ServerLine::~ServerLine() {
@ -168,20 +163,11 @@ void ServerLine::render() {
if(joinEnabled == true) { if(joinEnabled == true) {
selectButton.setEnabled(true); selectButton.setEnabled(true);
selectButton.setVisible(true); selectButton.setVisible(true);
gameFull.setEnabled(false);
gameFull.setEditable(false);
renderer.renderButton(&selectButton); renderer.renderButton(&selectButton);
} }
else { else {
selectButton.setEnabled(false); selectButton.setEnabled(false);
selectButton.setVisible(false); selectButton.setVisible(false);
gameFull.setEnabled(true);
gameFull.setEditable(true);
renderer.renderLabel(&gameFull);
} }
//general info: //general info:
@ -200,7 +186,7 @@ void ServerLine::render() {
if (compatible) { if (compatible) {
renderer.renderLabel(&status); renderer.renderLabel(&status);
} }
if(gameFull.getEnabled() == false) { if(selectButton.getEnabled() == true) {
if (compatible) { if (compatible) {
//renderer.renderLabel(&ipAddressLabel); //renderer.renderLabel(&ipAddressLabel);
@ -221,7 +207,6 @@ void ServerLine::render() {
void ServerLine::setY(int y) { void ServerLine::setY(int y) {
selectButton.setY(y); selectButton.setY(y);
gameFull.setY(y);
//general info: //general info:
glestVersionLabel.setY(y); glestVersionLabel.setY(y);

1
source/glest_game/menu/server_line.h
View File

@ -33,7 +33,6 @@ private:
int baseY; int baseY;
bool compatible; bool compatible;
GraphicButton selectButton; GraphicButton selectButton;
GraphicLabel gameFull;
GraphicLabel wrongVersionLabel; GraphicLabel wrongVersionLabel;
//general info: //general info: