Fix typo in lua_api.txt

[dragonfireclient.git] / src / client.cpp

diff --git a/src/client.cpp b/src/client.cpp
index 19105b504d7d375b84ca24597b3c9c6176410139..5e8f20620f5b9b66000b552ff8541db0afdc3c45 100644 (file)
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -20,9 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "client.h"
 #include <iostream>
 #include "clientserver.h"
-#include "jmutexautolock.h"
+#include "jthread/jmutexautolock.h"
 #include "main.h"
 #include <sstream>
+#include "filesys.h"
 #include "porting.h"
 #include "mapsector.h"
 #include "mapblock_mesh.h"
@@ -47,6 +48,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/serialize.h"
 #include "config.h"
 #include "util/directiontables.h"
+#include "version.h"
 
 #if USE_CURL
 #include <curl/curl.h>
@@ -244,13 +246,14 @@ void * MediaFetchThread::Thread()
                std::ostringstream stream;
                curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_write_data);
                curl_easy_setopt(curl, CURLOPT_WRITEDATA, &stream);
+               curl_easy_setopt(curl, CURLOPT_USERAGENT, (std::string("Minetest ")+minetest_version_hash).c_str());
                res = curl_easy_perform(curl);
                if (res == CURLE_OK) {
                        std::string data = stream.str();
                        m_file_data.push_back(make_pair(i->name, data));
                } else {
                        m_failed.push_back(*i);
-                       infostream << "cURL request failed for " << i->name << std::endl;
+                       infostream << "cURL request failed for " << i->name << " (" << curl_easy_strerror(res) << ")"<< std::endl;
                }
                curl_easy_cleanup(curl);
        }
@@ -556,14 +559,14 @@ void Client::step(float dtime)
        
                        // Send TOSERVER_INIT
                        // [0] u16 TOSERVER_INIT
-                       // [2] u8 SER_FMT_VER_HIGHEST
+                       // [2] u8 SER_FMT_VER_HIGHEST_READ
                        // [3] u8[20] player_name
                        // [23] u8[28] password (new in some version)
                        // [51] u16 minimum supported network protocol version (added sometime)
                        // [53] u16 maximum supported network protocol version (added later than the previous one)
                        SharedBuffer<u8> data(2+1+PLAYERNAME_SIZE+PASSWORD_SIZE+2+2);
                        writeU16(&data[0], TOSERVER_INIT);
-                       writeU8(&data[2], SER_FMT_VER_HIGHEST);
+                       writeU8(&data[2], SER_FMT_VER_HIGHEST_READ);
 
                        memset((char*)&data[3], 0, PLAYERNAME_SIZE);
                        snprintf((char*)&data[3], PLAYERNAME_SIZE, "%s", myplayer->getName());
@@ -692,9 +695,14 @@ void Client::step(float dtime)
                                        m_client_event_queue.push_back(event);
                                }
                        }
+                       else if(event.type == CEE_PLAYER_BREATH)
+                       {
+                                       u16 breath = event.player_breath.amount;
+                                       sendBreath(breath);
+                       }
                }
        }
-       
+
        /*
                Print some info
        */
@@ -1149,8 +1157,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
                infostream<<"Client: TOCLIENT_INIT received with "
                                "deployed="<<((int)deployed&0xff)<<std::endl;
 
-               if(deployed < SER_FMT_VER_LOWEST
-                               || deployed > SER_FMT_VER_HIGHEST)
+               if(!ser_ver_supported(deployed))
                {
                        infostream<<"Client: TOCLIENT_INIT: Server sent "
                                        <<"unsupported ser_fmt_ver"<<std::endl;
@@ -1295,6 +1302,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
                        */
                        //infostream<<"Updating"<<std::endl;
                        block->deSerialize(istr, ser_version, false);
+                       block->deSerializeNetworkSpecific(istr);
                }
                else
                {
@@ -1304,6 +1312,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
                        //infostream<<"Creating new"<<std::endl;
                        block = new MapBlock(&m_env.getMap(), p, this);
                        block->deSerialize(istr, ser_version, false);
+                       block->deSerializeNetworkSpecific(istr);
                        sector->insertBlock(block);
                }
 
@@ -1350,8 +1359,6 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
                        std::istringstream is(datastring, std::ios_base::binary);
                        //t3.stop();
                        
-                       //m_env.printPlayers(infostream);
-
                        //TimeTaker t4("player get", m_device);
                        Player *player = m_env.getLocalPlayer();
                        assert(player != NULL);
@@ -1579,6 +1586,15 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
                        m_client_event_queue.push_back(event);
                }
        }
+       else if(command == TOCLIENT_BREATH)
+       {
+               std::string datastring((char*)&data[2], datasize-2);
+               std::istringstream is(datastring, std::ios_base::binary);
+               Player *player = m_env.getLocalPlayer();
+               assert(player != NULL);
+               u16 breath = readU16(is);
+               player->setBreath(breath) ;
+       }
        else if(command == TOCLIENT_MOVE_PLAYER)
        {
                std::string datastring((char*)&data[2], datasize-2);
@@ -2161,6 +2177,10 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
                        s32 hotbar_itemcount = readS32((u8*) value.c_str());
                        if(hotbar_itemcount > 0 && hotbar_itemcount <= HUD_HOTBAR_ITEMCOUNT_MAX)
                                player->hud_hotbar_itemcount = hotbar_itemcount;
+               } else if (param == HUD_PARAM_HOTBAR_IMAGE) {
+                       ((LocalPlayer *) player)->hotbar_image = value;
+               } else if (param == HUD_PARAM_HOTBAR_SELECTED_IMAGE) {
+                       ((LocalPlayer *) player)->hotbar_selected_image = value;
                }
        }
        else
@@ -2359,6 +2379,20 @@ void Client::sendDamage(u8 damage)
        Send(0, data, true);
 }
 
+void Client::sendBreath(u16 breath)
+{
+       DSTACK(__FUNCTION_NAME);
+       std::ostringstream os(std::ios_base::binary);
+
+       writeU16(os, TOSERVER_BREATH);
+       writeU16(os, breath);
+       // Make data buffer
+       std::string s = os.str();
+       SharedBuffer<u8> data((u8*)s.c_str(), s.size());
+       // Send as reliable
+       Send(0, data, true);
+}
+
 void Client::sendRespawn()
 {
        DSTACK(__FUNCTION_NAME);
@@ -2694,7 +2728,7 @@ u16 Client::getBreath()
 {
        Player *player = m_env.getLocalPlayer();
        assert(player != NULL);
-       return player->breath;
+       return player->getBreath();
 }
 
 bool Client::getChatMessage(std::wstring &message)