mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-01 06:00:15 +02:00
Code Issues Projects Releases Wiki Activity

only display updates based on build number, not version number

Browse Source
This commit is contained in:
jacob1
2017-07-23 16:41:38 -04:00
parent aad8eba5df
commit 1cfd9d8fc7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/Client.cpp
View File

@@ -831,7 +831,7 @@ bool Client::CheckUpdate(void *updateRequest, bool checkSession)
int stableBuild = stableVersion["Build"].asInt(); int stableBuild = stableVersion["Build"].asInt();
std::string stableFile = stableVersion["File"].asString(); std::string stableFile = stableVersion["File"].asString();
std::string stableChangelog = stableVersion["Changelog"].asString(); std::string stableChangelog = stableVersion["Changelog"].asString();
if (stableMajor > SAVE_VERSION || (stableMinor > MINOR_VERSION && stableMajor == SAVE_VERSION) || stableBuild > BUILD_NUM) if (stableBuild > BUILD_NUM)
{ {
updateAvailable = true; updateAvailable = true;
updateInfo = UpdateInfo(stableMajor, stableMinor, stableBuild, stableFile, stableChangelog, UpdateInfo::Stable); updateInfo = UpdateInfo(stableMajor, stableMinor, stableBuild, stableFile, stableChangelog, UpdateInfo::Stable);
@@ -846,7 +846,7 @@ bool Client::CheckUpdate(void *updateRequest, bool checkSession)
int betaBuild = betaVersion["Build"].asInt(); int betaBuild = betaVersion["Build"].asInt();
std::string betaFile = betaVersion["File"].asString(); std::string betaFile = betaVersion["File"].asString();
std::string betaChangelog = betaVersion["Changelog"].asString(); std::string betaChangelog = betaVersion["Changelog"].asString();
if (betaMajor > SAVE_VERSION || (betaMinor > MINOR_VERSION && betaMajor == SAVE_VERSION) || betaBuild > BUILD_NUM) if (betaBuild > BUILD_NUM)
{ {
updateAvailable = true; updateAvailable = true;
updateInfo = UpdateInfo(betaMajor, betaMinor, betaBuild, betaFile, betaChangelog, UpdateInfo::Beta); updateInfo = UpdateInfo(betaMajor, betaMinor, betaBuild, betaFile, betaChangelog, UpdateInfo::Beta);

2
src/gui/game/GameView.cpp
View File

@@ -1491,7 +1491,7 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
case 'a': case 'a':
if ((Client::Ref().GetAuthUser().UserElevation == User::ElevationModerator if ((Client::Ref().GetAuthUser().UserElevation == User::ElevationModerator
|| Client::Ref().GetAuthUser().UserElevation == User::ElevationAdmin || Client::Ref().GetAuthUser().UserElevation == User::ElevationAdmin
|| Client::Ref().GetAuthUser().Username == "Mrprocom") && ctrl) || Client::Ref().GetAuthUser().Username == "Mrprocom") && ctrl)
{ {
std::string authorString = Client::Ref().GetAuthorInfo().toStyledString(); std::string authorString = Client::Ref().GetAuthorInfo().toStyledString();
new InformationMessage("Save authorship info", authorString, true); new InformationMessage("Save authorship info", authorString, true);