mirror of
https://github.com/glest/glest-source.git
synced 2025-09-09 23:40:45 +02:00
fixing the CRCs on the masterserver ( work in progress )
This commit is contained in:
@@ -409,12 +409,13 @@ void MenuStateMods::simpleTask(BaseThread *callingThread) {
|
|||||||
|
|
||||||
if(config.getString("Masterserver","") != "") {
|
if(config.getString("Masterserver","") != "") {
|
||||||
string baseURL = config.getString("Masterserver");
|
string baseURL = config.getString("Masterserver");
|
||||||
|
string phpVersionParam = config.getString("phpVersionParam","?version=1");
|
||||||
|
|
||||||
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line %d] About to call first http url, base [%s]..\n",__FILE__,__FUNCTION__,__LINE__,baseURL.c_str());
|
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line %d] About to call first http url, base [%s]..\n",__FILE__,__FUNCTION__,__LINE__,baseURL.c_str());
|
||||||
|
|
||||||
CURL *handle = SystemFlags::initHTTP();
|
CURL *handle = SystemFlags::initHTTP();
|
||||||
CURLcode curlResult = CURLE_OK;
|
CURLcode curlResult = CURLE_OK;
|
||||||
techsMetaData = SystemFlags::getHTTP(baseURL + "showTechsForGlest.php",handle,-1,&curlResult);
|
techsMetaData = SystemFlags::getHTTP(baseURL + "showTechsForGlest.php"+phpVersionParam,handle,-1,&curlResult);
|
||||||
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("techsMetaData [%s] curlResult = %d\n",techsMetaData.c_str(),curlResult);
|
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("techsMetaData [%s] curlResult = %d\n",techsMetaData.c_str(),curlResult);
|
||||||
|
|
||||||
if(callingThread->getQuitStatus() == true || safeMutexThreadOwner.isValidMutex() == false) {
|
if(callingThread->getQuitStatus() == true || safeMutexThreadOwner.isValidMutex() == false) {
|
||||||
@@ -433,7 +434,7 @@ void MenuStateMods::simpleTask(BaseThread *callingThread) {
|
|||||||
(curlResult != CURLE_COULDNT_RESOLVE_HOST &&
|
(curlResult != CURLE_COULDNT_RESOLVE_HOST &&
|
||||||
curlResult != CURLE_COULDNT_CONNECT)) {
|
curlResult != CURLE_COULDNT_CONNECT)) {
|
||||||
|
|
||||||
tilesetsMetaData = SystemFlags::getHTTP(baseURL + "showTilesetsForGlest.php",handle,-1,&curlResult);
|
tilesetsMetaData = SystemFlags::getHTTP(baseURL + "showTilesetsForGlest.php"+phpVersionParam,handle,-1,&curlResult);
|
||||||
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("tilesetsMetaData [%s]\n",tilesetsMetaData.c_str());
|
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("tilesetsMetaData [%s]\n",tilesetsMetaData.c_str());
|
||||||
|
|
||||||
if(callingThread->getQuitStatus() == true || safeMutexThreadOwner.isValidMutex() == false) {
|
if(callingThread->getQuitStatus() == true || safeMutexThreadOwner.isValidMutex() == false) {
|
||||||
@@ -448,7 +449,7 @@ void MenuStateMods::simpleTask(BaseThread *callingThread) {
|
|||||||
console.addLine(string("#2 ") + szBuf,true);
|
console.addLine(string("#2 ") + szBuf,true);
|
||||||
}
|
}
|
||||||
|
|
||||||
mapsMetaData = SystemFlags::getHTTP(baseURL + "showMapsForGlest.php",handle,-1,&curlResult);
|
mapsMetaData = SystemFlags::getHTTP(baseURL + "showMapsForGlest.php"+phpVersionParam,handle,-1,&curlResult);
|
||||||
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("mapsMetaData [%s]\n",mapsMetaData.c_str());
|
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("mapsMetaData [%s]\n",mapsMetaData.c_str());
|
||||||
|
|
||||||
if(callingThread->getQuitStatus() == true || safeMutexThreadOwner.isValidMutex() == false) {
|
if(callingThread->getQuitStatus() == true || safeMutexThreadOwner.isValidMutex() == false) {
|
||||||
@@ -463,7 +464,7 @@ void MenuStateMods::simpleTask(BaseThread *callingThread) {
|
|||||||
console.addLine(string("#3 ") + szBuf,true);
|
console.addLine(string("#3 ") + szBuf,true);
|
||||||
}
|
}
|
||||||
|
|
||||||
scenariosMetaData = SystemFlags::getHTTP(baseURL + "showScenariosForGlest.php",handle,-1,&curlResult);
|
scenariosMetaData = SystemFlags::getHTTP(baseURL + "showScenariosForGlest.php"+phpVersionParam,handle,-1,&curlResult);
|
||||||
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("scenariosMetaData [%s]\n",scenariosMetaData.c_str());
|
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("scenariosMetaData [%s]\n",scenariosMetaData.c_str());
|
||||||
|
|
||||||
if(curlResult != CURLE_OK) {
|
if(curlResult != CURLE_OK) {
|
||||||
|
Reference in New Issue
Block a user