projects / oweals / minetest.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Cleanup in content_mapblock (#5746)
[oweals/minetest.git] / src / content_cao.cpp
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index e829fc7614dd85d8dfaa863c33e900bc224364f5..5690ecf1ebda041f35230093c91ed6291c555374 100644 (file)
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -44,6 +44,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "camera.h" // CameraModes
 #include "wieldmesh.h"
 #include "log.h"
+#include <algorithm>
 
 class Settings;
 struct ToolCapabilities;
@@ -705,26 +706,11 @@ scene::ISceneNode* GenericCAO::getSceneNode()
        return NULL;
 }
 
-scene::IMeshSceneNode* GenericCAO::getMeshSceneNode()
-{
-       return m_meshnode;
-}
-
 scene::IAnimatedMeshSceneNode* GenericCAO::getAnimatedMeshSceneNode()
 {
        return m_animated_meshnode;
 }
 
-WieldMeshSceneNode* GenericCAO::getWieldMeshSceneNode()
-{
-       return m_wield_meshnode;
-}
-
-scene::IBillboardSceneNode* GenericCAO::getSpriteSceneNode()
-{
-       return m_spritenode;
-}
-
 void GenericCAO::setChildrenVisible(bool toset)
 {
        for (std::vector<u16>::size_type i = 0; i < m_children.size(); i++) {
@@ -933,23 +919,30 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr,
                        errorstream<<"GenericCAO::addToScene(): Could not load mesh "<<m_prop.mesh<<std::endl;
        }
        else if(m_prop.visual == "wielditem") {
-               infostream<<"GenericCAO::addToScene(): wielditem"<<std::endl;
-               infostream<<"textures: "<<m_prop.textures.size()<<std::endl;
-               if(m_prop.textures.size() >= 1){
-                       infostream<<"textures[0]: "<<m_prop.textures[0]<<std::endl;
-                       IItemDefManager *idef = m_client->idef();
-                       ItemStack item(m_prop.textures[0], 1, 0, "", idef);
-
-                       m_wield_meshnode = new WieldMeshSceneNode(
-                                       smgr->getRootSceneNode(), smgr, -1);
-                       m_wield_meshnode->setItem(item, m_client);
-
-                       m_wield_meshnode->setScale(v3f(m_prop.visual_size.X/2,
-                                       m_prop.visual_size.Y/2,
-                                       m_prop.visual_size.X/2));
-                       u8 li = m_last_light;
-                       m_wield_meshnode->setColor(video::SColor(255,li,li,li));
+               ItemStack item;
+               infostream << "GenericCAO::addToScene(): wielditem" << std::endl;
+               if (m_prop.wield_item == "") {
+                       // Old format, only textures are specified.
+                       infostream << "textures: " << m_prop.textures.size() << std::endl;
+                       if (m_prop.textures.size() >= 1) {
+                               infostream << "textures[0]: " << m_prop.textures[0]
+                                       << std::endl;
+                               IItemDefManager *idef = m_client->idef();
+                               item = ItemStack(m_prop.textures[0], 1, 0, idef);
+                       }
+               } else {
+                       infostream << "serialized form: " << m_prop.wield_item << std::endl;
+                       item.deSerialize(m_prop.wield_item, m_client->idef());
                }
+               m_wield_meshnode = new WieldMeshSceneNode(smgr->getRootSceneNode(),
+                       smgr, -1);
+               m_wield_meshnode->setItem(item, m_client);
+
+               m_wield_meshnode->setScale(
+                       v3f(m_prop.visual_size.X / 2, m_prop.visual_size.Y / 2,
+                               m_prop.visual_size.X / 2));
+               u8 li = m_last_light;
+               m_wield_meshnode->setColor(video::SColor(255, li, li, li));
        } else {
                infostream<<"GenericCAO::addToScene(): \""<<m_prop.visual
                                <<"\" not supported"<<std::endl;
@@ -1034,12 +1027,9 @@ void GenericCAO::updateNodePos()
 void GenericCAO::step(float dtime, ClientEnvironment *env)
 {
        // Handel model of local player instantly to prevent lags
-       if(m_is_local_player)
-       {
+       if (m_is_local_player) {
                LocalPlayer *player = m_env->getLocalPlayer();
-
-               if (m_is_visible)
-               {
+               if (m_is_visible) {
                        int old_anim = player->last_animation;
                        float old_anim_speed = player->last_animation_speed;
                        m_position = player->getPosition() + v3f(0,BS,0);
@@ -1047,7 +1037,7 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)
                        m_acceleration = v3f(0,0,0);
                        pos_translator.vect_show = m_position;
                        m_yaw = player->getYaw();
-                       PlayerControl controls = player->getPlayerControl();
+                       const PlayerControl &controls = player->getPlayerControl();
 
                        bool walking = false;
                        if (controls.up || controls.down || controls.left || controls.right ||
@@ -1068,11 +1058,10 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)
                                        m_client->checkLocalPrivilege("fly"))))
                                        new_speed *= 1.5;
                        // slowdown speed if sneeking
-                       if(controls.sneak && walking)
+                       if (controls.sneak && walking)
                                new_speed /= 2;
 
-                       if(walking && (controls.LMB || controls.RMB))
-                       {
+                       if (walking && (controls.LMB || controls.RMB)) {
                                new_anim = player->local_animations[3];
                                player->last_animation = WD_ANIM;
                        } else if(walking) {
@@ -1085,8 +1074,7 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)
 
                        // Apply animations if input detected and not attached
                        // or set idle animation
-                       if ((new_anim.X + new_anim.Y) > 0 && !player->isAttached)
-                       {
+                       if ((new_anim.X + new_anim.Y) > 0 && !player->isAttached) {
                                allow_update = true;
                                m_animation_range = new_anim;
                                m_animation_speed = new_speed;
@@ -1094,8 +1082,7 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)
                        } else {
                                player->last_animation = NO_ANIM;
 
-                               if (old_anim != NO_ANIM)
-                               {
+                               if (old_anim != NO_ANIM) {
                                        m_animation_range = player->local_animations[0];
                                        updateAnimation();
                                }
@@ -1306,7 +1293,7 @@ void GenericCAO::updateTexturePos()
        }
 }
 
-void GenericCAO::updateTextures(const std::string mod)
+void GenericCAO::updateTextures(std::string mod)
 {
        ITextureSource *tsrc = m_client->tsrc();
 
@@ -1582,6 +1569,10 @@ void GenericCAO::processMessage(const std::string &data)
                        m_initial_tx_basepos_set = true;
                        m_tx_basepos = m_prop.initial_sprite_basepos;
                }
+               if (m_is_local_player) {
+                       LocalPlayer *player = m_env->getLocalPlayer();
+                       player->makes_footstep_sound = m_prop.makes_footstep_sound;
+               }
 
                if ((m_is_player && !m_is_local_player) && m_prop.nametag == "")
                        m_prop.nametag = m_name;
@@ -1645,6 +1636,7 @@ void GenericCAO::processMessage(const std::string &data)
                // these are sent inverted so we get true when the server sends nothing
                bool sneak = !readU8(is);
                bool sneak_glitch = !readU8(is);
+               bool new_move = !readU8(is);
 
 
                if(m_is_local_player)
@@ -1655,6 +1647,7 @@ void GenericCAO::processMessage(const std::string &data)
                        player->physics_override_gravity = override_gravity;
                        player->physics_override_sneak = sneak;
                        player->physics_override_sneak_glitch = sneak_glitch;
+                       player->physics_override_new_move = new_move;
                }
        } else if (cmd == GENERIC_CMD_SET_ANIMATION) {
                // TODO: change frames send as v2s32 value
@@ -1779,7 +1772,7 @@ void GenericCAO::processMessage(const std::string &data)
        } else {
                warningstream << FUNCTION_NAME
                        << ": unknown command or outdated client \""
-                       << cmd << std::endl;
+                       << +cmd << "\"" << std::endl;
        }
 }
 
Unnamed repository; edit this file 'description' to name the repository.