mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-06 16:36:29 +02:00
Code Issues Projects Releases Wiki Activity

Added update strings

Browse Source
This commit is contained in:
mathusummut
2019-03-21 14:09:46 +01:00
parent 42365f5562
commit 7ea2bbf60d
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/game/menu/menu_state_root.cpp
View File

@@ -286,13 +286,13 @@ namespace Game {
if (ftpMessageBox.mouseClick(x, y, button)) { if (ftpMessageBox.mouseClick(x, y, button)) {
ftpMessageBox.setEnabled(false); ftpMessageBox.setEnabled(false);
if (button == 0) { if (button == 0) {
string update = Config::getInstance().getString("UpdateDownloadURL", ""); string updateUrl = Config::getInstance().getString("UpdateDownloadURL", "");
if (update != "") { if (updateUrl != "") {
try { try {
#ifdef WIN32 #ifdef WIN32
ShellExecuteA(0, 0, update.c_str(), 0, 0, SW_SHOW); ShellExecuteA(0, 0, updateUrl.c_str(), 0, 0, SW_SHOW);
#else #else
printf("xdg-open call resulted in: %d\n", system(("xdg-open " + update).c_str())); printf("open call resulted in: %d\n", system(("open " + updateUrl).c_str()));
#endif #endif
} catch (...) { } catch (...) {
} }
@@ -803,12 +803,11 @@ namespace Game {
CURL *handle = SystemFlags::initHTTP(); CURL *handle = SystemFlags::initHTTP();
CURLcode curlResult = CURLE_OK; CURLcode curlResult = CURLE_OK;
string updateMetaData = string serverVersion = SystemFlags::getHTTP(baseURL, handle, -1, &curlResult);
SystemFlags::getHTTP(baseURL, handle, -1, &curlResult);
if (SystemFlags::VERBOSE_MODE_ENABLED) if (SystemFlags::VERBOSE_MODE_ENABLED)
printf("techsMetaData [%s] curlResult = %d\n", printf("techsMetaData [%s] curlResult = %d\n",
updateMetaData.c_str(), curlResult); serverVersion.c_str(), curlResult);
if (callingThread->getQuitStatus() == true if (callingThread->getQuitStatus() == true
|| safeMutexThreadOwner.isValidMutex() == false) { || safeMutexThreadOwner.isValidMutex() == false) {
@@ -835,19 +834,19 @@ namespace Game {
curlResult != CURLE_COULDNT_CONNECT)) { curlResult != CURLE_COULDNT_CONNECT)) {
//Properties props; //Properties props;
//props.loadFromText(updateMetaData); //props.loadFromText(serverVersion);
string currentVersion = GameVersionString + GameBuildDateString;
int compareResult = int compareResult =
compareMajorMinorVersion(GameVersionString + GameBuildDateString, updateMetaData); compareMajorMinorVersion(currentVersion, serverVersion);
//props.getString("LatestGameVersion", "")); //props.getString("LatestGameVersion", ""));
if (compareResult == 0) { if (compareResult == 0) {
if (GameVersionString != updateMetaData) { if (currentVersion != serverVersion) {
compareResult = -1; compareResult = -1;
} }
} }
if (SystemFlags::VERBOSE_MODE_ENABLED) if (SystemFlags::VERBOSE_MODE_ENABLED)
printf("compareResult = %d local [%s] remote [%s]\n", printf("compareResult = %d local [%s] remote [%s]\n",
compareResult, GameVersionString.c_str(), updateMetaData.c_str()); compareResult, GameVersionString.c_str(), serverVersion.c_str());
if (compareResult < 0) { if (compareResult < 0) {
/*string downloadBinaryKey = /*string downloadBinaryKey =
@@ -867,13 +866,13 @@ namespace Game {
ftpFileURL = Config::getInstance().getString("UpdateDownloadURL", ""); ftpFileURL = Config::getInstance().getString("UpdateDownloadURL", "");
if (ftpFileURL == "") { if (ftpFileURL == "") {
char szMsg[8096] = ""; char szMsg[8096] = "";
snprintf(szMsg, 8096, snprintf(szMsg, 8096, Lang::getInstance().getString("UpdateNotice", "").c_str(),
"A new update was detected: %s, please visit glest.io for details!", updateMetaData.c_str()); currentVersion.c_str(), serverVersion.c_str());
showFTPMessageBox(szMsg, "Update", false, true); showFTPMessageBox(szMsg, "Update", false, true);
} else { } else {
char szMsg[8096] = ""; char szMsg[8096] = "";
snprintf(szMsg, 8096, snprintf(szMsg, 8096, Lang::getInstance().getString("UpdateNoticeDownloadOffer", "").c_str(),
"A new update was detected: %s, do you want to download the update now?", updateMetaData.c_str()); currentVersion.c_str(), serverVersion.c_str());
showFTPMessageBox(szMsg, "Update", false, false); showFTPMessageBox(szMsg, "Update", false, false);
} }
} }