Mapgen V6: Respect water_level setting

[dragonfireclient.git] / src / convert_json.cpp

diff --git a/src/convert_json.cpp b/src/convert_json.cpp
index 61db67fd55808a2cc907c81c956ca77f739c92da..e8eede0b1edb435d2d6a7d92bfb7afd3c7c5f094 100644 (file)
--- a/src/convert_json.cpp
+++ b/src/convert_json.cpp
@@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "main.h" // for g_settings
 #include "settings.h"
+#include "version.h"
 
 #if USE_CURL
 #include <curl/curl.h>
@@ -56,6 +57,7 @@ Json::Value                 fetchJsonValue(const std::string url,
                curl_easy_setopt(curl, CURLOPT_WRITEDATA, &liststring);
                curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, g_settings->getS32("curl_timeout"));
                curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT_MS, g_settings->getS32("curl_timeout"));
+               curl_easy_setopt(curl, CURLOPT_USERAGENT, (std::string("Minetest ")+minetest_version_hash).c_str());
 
                if (chunk != 0)
                        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, chunk);
@@ -105,13 +107,17 @@ std::vector<ModStoreMod>    readModStoreList(Json::Value& modlist) {
 
                        //id
                        if (modlist[i]["id"].asString().size()) {
-                               const char* id_raw = modlist[i]["id"].asString().c_str();
+                               std::string id_raw = modlist[i]["id"].asString();
                                char* endptr = 0;
-                               int numbervalue = strtol(id_raw,&endptr,10);
+                               int numbervalue = strtol(id_raw.c_str(),&endptr,10);
 
-                               if ((*id_raw != 0) && (*endptr == 0)) {
+                               if ((id_raw != "") && (*endptr == 0)) {
                                        toadd.id = numbervalue;
                                }
+                               else {
+                                       errorstream << "readModStoreList: missing id" << std::endl;
+                                       toadd.valid = false;
+                               }
                        }
                        else {
                                errorstream << "readModStoreList: missing id" << std::endl;
@@ -163,11 +169,11 @@ ModStoreModDetails          readModStoreModDetails(Json::Value& details) {
                        ModStoreVersionEntry toadd;
 
                        if (details["version_set"][i]["id"].asString().size()) {
-                               const char* id_raw = details["version_set"][i]["id"].asString().c_str();
+                               std::string id_raw = details["version_set"][i]["id"].asString();
                                char* endptr = 0;
-                               int numbervalue = strtol(id_raw,&endptr,10);
+                               int numbervalue = strtol(id_raw.c_str(),&endptr,10);
 
-                               if ((*id_raw != 0) && (*endptr == 0)) {
+                               if ((id_raw != "") && (*endptr == 0)) {
                                        toadd.id = numbervalue;
                                }
                        }
@@ -215,11 +221,11 @@ ModStoreModDetails          readModStoreModDetails(Json::Value& details) {
 
                        if (details["categories"][i]["id"].asString().size()) {
 
-                               const char* id_raw = details["categories"][i]["id"].asString().c_str();
+                               std::string id_raw = details["categories"][i]["id"].asString();
                                char* endptr = 0;
-                               int numbervalue = strtol(id_raw,&endptr,10);
+                               int numbervalue = strtol(id_raw.c_str(),&endptr,10);
 
-                               if ((*id_raw != 0) && (*endptr == 0)) {
+                               if ((id_raw != "") && (*endptr == 0)) {
                                        toadd.id = numbervalue;
                                }
                        }
@@ -248,11 +254,11 @@ ModStoreModDetails          readModStoreModDetails(Json::Value& details) {
        if (details["author"].isObject()) {
                if (details["author"]["id"].asString().size()) {
 
-                       const char* id_raw = details["author"]["id"].asString().c_str();
+                       std::string id_raw = details["author"]["id"].asString();
                        char* endptr = 0;
-                       int numbervalue = strtol(id_raw,&endptr,10);
+                       int numbervalue = strtol(id_raw.c_str(),&endptr,10);
 
-                       if ((*id_raw != 0) && (*endptr == 0)) {
+                       if ((id_raw != "") && (*endptr == 0)) {
                                retval.author.id = numbervalue;
                        }
                        else {
@@ -282,11 +288,11 @@ ModStoreModDetails          readModStoreModDetails(Json::Value& details) {
        if (details["license"].isObject()) {
                if (details["license"]["id"].asString().size()) {
 
-                       const char* id_raw = details["license"]["id"].asString().c_str();
+                       std::string id_raw = details["license"]["id"].asString();
                        char* endptr = 0;
-                       int numbervalue = strtol(id_raw,&endptr,10);
+                       int numbervalue = strtol(id_raw.c_str(),&endptr,10);
 
-                       if ((*id_raw != 0) && (*endptr == 0)) {
+                       if ((id_raw != "") && (*endptr == 0)) {
                                retval.license.id = numbervalue;
                        }
                }
@@ -313,11 +319,11 @@ ModStoreModDetails          readModStoreModDetails(Json::Value& details) {
        if (details["titlepic"].isObject()) {
                if (details["titlepic"]["id"].asString().size()) {
 
-                       const char* id_raw = details["titlepic"]["id"].asString().c_str();
+                       std::string id_raw = details["titlepic"]["id"].asString();
                        char* endptr = 0;
-                       int numbervalue = strtol(id_raw,&endptr,10);
+                       int numbervalue = strtol(id_raw.c_str(),&endptr,10);
 
-                       if ((*id_raw != 0) && (*endptr == 0)) {
+                       if ((id_raw != "") && (*endptr == 0)) {
                                retval.titlepic.id = numbervalue;
                        }
                }
@@ -332,11 +338,11 @@ ModStoreModDetails          readModStoreModDetails(Json::Value& details) {
 
                if (details["titlepic"]["mod"].asString().size()) {
 
-                       const char* mod_raw = details["titlepic"]["mod"].asString().c_str();
+                       std::string mod_raw = details["titlepic"]["mod"].asString();
                        char* endptr = 0;
-                       int numbervalue = strtol(mod_raw,&endptr,10);
+                       int numbervalue = strtol(mod_raw.c_str(),&endptr,10);
 
-                       if ((*mod_raw != 0) && (*endptr == 0)) {
+                       if ((mod_raw != "") && (*endptr == 0)) {
                                retval.titlepic.mod = numbervalue;
                        }
                }
@@ -345,11 +351,11 @@ ModStoreModDetails          readModStoreModDetails(Json::Value& details) {
        //id
        if (details["id"].asString().size()) {
 
-               const char* id_raw = details["id"].asString().c_str();
+               std::string id_raw = details["id"].asString();
                char* endptr = 0;
-               int numbervalue = strtol(id_raw,&endptr,10);
+               int numbervalue = strtol(id_raw.c_str(),&endptr,10);
 
-               if ((*id_raw != 0) && (*endptr == 0)) {
+               if ((id_raw != "") && (*endptr == 0)) {
                        retval.id = numbervalue;
                }
        }
@@ -389,11 +395,11 @@ ModStoreModDetails          readModStoreModDetails(Json::Value& details) {
        //value
        if (details["rating"].asString().size()) {
 
-               const char* id_raw = details["rating"].asString().c_str();
+               std::string id_raw = details["rating"].asString();
                char* endptr = 0;
-               float numbervalue = strtof(id_raw,&endptr);
+               float numbervalue = strtof(id_raw.c_str(),&endptr);
 
-               if ((*id_raw != 0) && (*endptr == 0)) {
+               if ((id_raw != "") && (*endptr == 0)) {
                        retval.rating = numbervalue;
                }
        }