mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-25 17:20:43 +02:00
Code Issues Projects Releases Wiki Activity

- bugfix for shared team resources

Browse Source 
- added some new internal feature code to test auto updates for a future release
This commit is contained in:
SoftCoder
2014-12-30 12:16:35 -08:00
parent bcd6c7b310
commit efa7cb0346
10 changed files with 628 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -787,54 +787,70 @@ int round(float f){
}
// ==================== misc ====================
int compareMajorMinorVersion(string versionA,string versionB){
int majorA=getMajor(versionA);
int minorA=getMinor(versionA);
int majorB=getMajor(versionB);
int minorB=getMinor(versionB);
int compareMajorMinorVersion(string versionA,string versionB, bool checkForNewVersionUpdates) {
int majorA = getMajor(versionA);
int minorA = getMinor(versionA);
int majorB = getMajor(versionB);
int minorB = getMinor(versionB);
if(majorA<majorB) return -1;
else if(majorA==majorB){
if(minorA<minorB) return -1;
else if(minorA==minorB){
if(majorA < majorB) {
return -1;
}
else if(majorA == majorB) {
if(minorA < minorB) {
return -1;
}
else if(minorA == minorB) {
if(checkForNewVersionUpdates) {
if(versionA != versionB) {
return -1;
}
}
return 0;
}
else{
else {
return 1;
}
}
else{
else {
return 1;
}
}
int getMajor(string version){
vector<string> parts=split(version.substr(1),".");
int getMajor(string version) {
vector<string> parts = split(version.substr(1),".");
if(parts.size()>2 && parts[0] != "" && IsNumeric(parts[0].c_str(),false))
if(parts.size() > 2 && parts[0] != "" && IsNumeric(parts[0].c_str(),false)) {
return strToInt(parts[0]);
else
}
else {
return 0;
}
}
int getMinor(string version){
vector<string> parts=split(version.substr(1),".");
if(parts.size()>2 && parts[1] != ""){
int getMinor(string version) {
vector<string> parts = split(version.substr(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) )
if(IsNumeric((resultStr + parts[1][i]).c_str(),false) ) {
resultStr += parts[1][i];
else
}
else {
break;
}
}
if(resultStr=="")
if(resultStr == "") {
return 0;
else
}
else {
return strToInt(resultStr);
}
}
else
else {
return 0;
}
}
bool checkVersionComptability(string clientVersionString, string serverVersionString) {