Merge branch 'master' of https://github.com/EliasFleckenstein03/dragonfireclient

[dragonfireclient.git] / src / remoteplayer.cpp

diff --git a/src/remoteplayer.cpp b/src/remoteplayer.cpp
index 20c18ee155c3ce18495f4f4e23472763163aa63f..925ad001b987de64d8e633972a4baf7757b6fc49 100644 (file)
--- a/src/remoteplayer.cpp
+++ b/src/remoteplayer.cpp
@@ -20,12 +20,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "remoteplayer.h"
 #include <json/json.h>
-#include "content_sao.h"
 #include "filesys.h"
 #include "gamedef.h"
 #include "porting.h"  // strlcpy
 #include "server.h"
 #include "settings.h"
+#include "convert_json.h"
+#include "server/player_sao.h"
 
 /*
        RemotePlayer
@@ -65,115 +66,23 @@ RemotePlayer::RemotePlayer(const char *name, IItemDefManager *idef):
        m_cloud_params.height = 120.0f;
        m_cloud_params.thickness = 16.0f;
        m_cloud_params.speed = v2f(0.0f, -2.0f);
-}
-
-void RemotePlayer::serializeExtraAttributes(std::string &output)
-{
-       assert(m_sao);
-       Json::Value json_root;
-       const PlayerAttributes &attrs = m_sao->getExtendedAttributes();
-       for (const auto &attr : attrs) {
-               json_root[attr.first] = attr.second;
-       }
-
-       Json::FastWriter writer;
-       output = writer.write(json_root);
-       m_sao->setExtendedAttributeModified(false);
-}
-
 
-void RemotePlayer::deSerialize(std::istream &is, const std::string &playername,
-               PlayerSAO *sao)
-{
-       Settings args;
-
-       if (!args.parseConfigLines(is, "PlayerArgsEnd")) {
-               throw SerializationError("PlayerArgsEnd of player " + playername + " not found!");
-       }
-
-       m_dirty = true;
-       //args.getS32("version"); // Version field value not used
-       const std::string &name = args.get("name");
-       strlcpy(m_name, name.c_str(), PLAYERNAME_SIZE);
+       // Skybox defaults:
 
-       if (sao) {
-               try {
-                       sao->setHPRaw(args.getS32("hp"));
-               } catch(SettingNotFoundException &e) {
-                       sao->setHPRaw(PLAYER_MAX_HP);
-               }
-
-               try {
-                       sao->setBasePosition(args.getV3F("position"));
-               } catch (SettingNotFoundException &e) {}
-
-               try {
-                       sao->setPitch(args.getFloat("pitch"));
-               } catch (SettingNotFoundException &e) {}
-               try {
-                       sao->setYaw(args.getFloat("yaw"));
-               } catch (SettingNotFoundException &e) {}
-
-               try {
-                       sao->setBreath(args.getS32("breath"), false);
-               } catch (SettingNotFoundException &e) {}
-
-               try {
-                       const std::string &extended_attributes = args.get("extended_attributes");
-                       Json::Reader reader;
-                       Json::Value attr_root;
-                       reader.parse(extended_attributes, attr_root);
-
-                       const Json::Value::Members attr_list = attr_root.getMemberNames();
-                       for (const auto &it : attr_list) {
-                               Json::Value attr_value = attr_root[it];
-                               sao->setExtendedAttribute(it, attr_value.asString());
-                       }
-               } catch (SettingNotFoundException &e) {}
-       }
+       SkyboxDefaults sky_defaults;
 
-       inventory.deSerialize(is);
+       m_skybox_params.sky_color = sky_defaults.getSkyColorDefaults();
+       m_skybox_params.type = "regular";
+       m_skybox_params.clouds = true;
+       m_skybox_params.fog_sun_tint = video::SColor(255, 244, 125, 29);
+       m_skybox_params.fog_moon_tint = video::SColorf(0.5, 0.6, 0.8, 1).toSColor();
+       m_skybox_params.fog_tint_type = "default";
 
-       if (inventory.getList("craftpreview") == NULL) {
-               // Convert players without craftpreview
-               inventory.addList("craftpreview", 1);
-
-               bool craftresult_is_preview = true;
-               if(args.exists("craftresult_is_preview"))
-                       craftresult_is_preview = args.getBool("craftresult_is_preview");
-               if(craftresult_is_preview)
-               {
-                       // Clear craftresult
-                       inventory.getList("craftresult")->changeItem(0, ItemStack());
-               }
-       }
+       m_sun_params = sky_defaults.getSunDefaults();
+       m_moon_params = sky_defaults.getMoonDefaults();
+       m_star_params = sky_defaults.getStarDefaults();
 }
 
-void RemotePlayer::serialize(std::ostream &os)
-{
-       // Utilize a Settings object for storing values
-       Settings args;
-       args.setS32("version", 1);
-       args.set("name", m_name);
-
-       // This should not happen
-       assert(m_sao);
-       args.setS32("hp", m_sao->getHP());
-       args.setV3F("position", m_sao->getBasePosition());
-       args.setFloat("pitch", m_sao->getPitch());
-       args.setFloat("yaw", m_sao->getYaw());
-       args.setS32("breath", m_sao->getBreath());
-
-       std::string extended_attrs;
-       serializeExtraAttributes(extended_attrs);
-       args.set("extended_attributes", extended_attrs);
-
-       args.writeLines(os);
-
-       os<<"PlayerArgsEnd\n";
-
-       inventory.serialize(os);
-}
 
 const RemotePlayerChatResult RemotePlayer::canSendChatMessage()
 {
@@ -213,3 +122,10 @@ const RemotePlayerChatResult RemotePlayer::canSendChatMessage()
        m_chat_message_allowance -= 1.0f;
        return RPLAYER_CHATRESULT_OK;
 }
+
+void RemotePlayer::onSuccessfulSave()
+{
+       setModified(false);
+       if (m_sao)
+               m_sao->getMeta().setModified(false);
+}