Allow full circle rotation with 2degs step for plantlike drawtype.

[oweals/minetest.git] / src / convert_json.cpp

diff --git a/src/convert_json.cpp b/src/convert_json.cpp
index a6107aa64a7fec1790e9d133c9fabb6c95a2178b..e79103a16c88d9e01170ba61e57f0eb7e1b04ca0 100644 (file)
--- a/src/convert_json.cpp
+++ b/src/convert_json.cpp
@@ -32,20 +32,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "porting.h"
 
 Json::Value                 fetchJsonValue(const std::string &url,
-               struct curl_slist *chunk) {
+               std::vector<std::string> *extra_headers) {
 
        HTTPFetchRequest fetchrequest;
        HTTPFetchResult fetchresult;
        fetchrequest.url = url;
        fetchrequest.caller = HTTPFETCH_SYNC;
 
-#if USE_CURL
-       struct curl_slist* runptr = chunk;
-       while(runptr) {
-               fetchrequest.extra_headers.push_back(runptr->data);
-               runptr = runptr->next;
-       }
-#endif
+       if (extra_headers != NULL)
+               fetchrequest.extra_headers = *extra_headers;
+
        httpfetch_sync(fetchrequest,fetchresult);
 
        if (!fetchresult.succeeded) {