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

Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop

This commit is contained in:
SoftCoder 2014-12-21 13:02:57 -08:00
parent 0a55746ae2 341d504cd2
commit 494061b80d
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/glest_game/facilities/components.cpp
View File

@ -341,6 +341,7 @@ const int GraphicButton::defW= 90;
GraphicButton::GraphicButton(std::string containerName, std::string objName) : GraphicComponent(containerName,objName) {
lighted = false;
alwaysLighted = false;
useCustomTexture = false;
customTexture = NULL;
}

6
source/glest_game/facilities/components.h
View File

@ -212,6 +212,7 @@ public:
private:
bool lighted;
bool alwaysLighted;
bool useCustomTexture;
Texture *customTexture;
@ -226,9 +227,10 @@ public:
void setUseCustomTexture(bool value) { useCustomTexture=value; }
void setCustomTexture(Texture *value) { customTexture=value; }
bool getLighted() const {return lighted;}
bool getLighted() const {return lighted||alwaysLighted;}
void setLighted(bool lighted) {this->lighted= lighted;}
bool getAlwaysLighted() const {return alwaysLighted;}
void setAlwaysLighted(bool value) {this->alwaysLighted= value;}
virtual bool mouseMove(int x, int y);
};

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

@ -154,6 +154,7 @@ ServerLine::ServerLine(MasterServerInfo *mServerInfo, int lineIndex, int baseY,
i+= 130;
selectButton.init(i, baseY - lineOffset, 30);
selectButton.setText(">");
selectButton.setAlwaysLighted(true);
//printf("glestVersionString [%s] masterServerInfo->getGlestVersion() [%s]\n",glestVersionString.c_str(),masterServerInfo->getGlestVersion().c_str());
compatible= checkVersionComptability(glestVersionString, masterServerInfo.getGlestVersion());

17
source/shared_lib/sources/util/util.cpp
View File

@ -819,9 +819,20 @@ int getMajor(string version){
int getMinor(string version){
vector<string> parts=split(version.substr(1),".");
if(parts.size()>2 && parts[1] != "" && IsNumeric(parts[1].c_str(),false))
return strToInt(parts[1]);
if(parts.size()>2 && parts[1] != ""){
string resultStr="";
for (int i = 0; i < (int)parts[1].length(); ++i) {
// just add leading numbers
if(IsNumeric((resultStr+parts[1][i]).c_str(),false) )
resultStr += parts[1][i];
else
break;
}
if(resultStr=="")
return 0;
else
return strToInt(resultStr);
}
else
return 0;
}