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

don't mix functionality

Browse Source 
Not a bug fix, just trying to keep things more clean.
This commit is contained in:
titiger
2015-01-01 17:16:24 +01:00
parent 51c67cc7ff
commit 4a292ed1d1
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/shared_lib/include/util/util.h
View File

@@ -239,7 +239,7 @@ float saturate(float value);
int round(float f);
//misc
int compareMajorMinorVersion(string versionA,string versionB, bool checkForNewVersionUpdates=false);
int compareMajorMinorVersion(string versionA,string versionB);
int getMajor(string version);
int getMinor(string version);
bool checkVersionComptability(string clientVersionString, string serverVersionString);

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

@@ -787,7 +787,7 @@ int round(float f){
}
// ==================== misc ====================
int compareMajorMinorVersion(string versionA,string versionB, bool checkForNewVersionUpdates) {
int compareMajorMinorVersion(string versionA,string versionB) {
int majorA = getMajor(versionA);
int minorA = getMinor(versionA);
int majorB = getMajor(versionB);
@@ -801,11 +801,6 @@ int compareMajorMinorVersion(string versionA,string versionB, bool checkForNewVe
return -1;
}
else if(minorA == minorB) {
if(checkForNewVersionUpdates) {
if(versionA != versionB) {
return -1;
}
}
return 0;
}
else {