C++11 patchset 9: move hardcoded init parameters to class definitions (part 1) (...

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

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index d18a0233f14b7e9657b695033623cc8884992c90..0b9df64515e27bee79a7c1f36117d4b55f72fbd3 100644 (file)
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -44,21 +44,12 @@ 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;
 
-UNORDERED_MAP<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;
-
-SmoothTranslator::SmoothTranslator():
-       vect_old(0,0,0),
-       vect_show(0,0,0),
-       vect_aim(0,0,0),
-       anim_counter(0),
-       anim_time(0),
-       anim_time_counter(0),
-       aim_is_end(true)
-{}
+std::unordered_map<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;
 
 void SmoothTranslator::init(v3f vect)
 {
@@ -71,11 +62,6 @@ void SmoothTranslator::init(v3f vect)
        aim_is_end = true;
 }
 
-void SmoothTranslator::sharpen()
-{
-       init(vect_show);
-}
-
 void SmoothTranslator::update(v3f vect_new, bool is_end_position, float update_interval)
 {
        aim_is_end = is_end_position;
@@ -112,11 +98,6 @@ void SmoothTranslator::translate(f32 dtime)
        vect_show = vect_old + vect_move * moveratio;
 }
 
-bool SmoothTranslator::is_moving()
-{
-       return ((anim_time_counter / anim_time) < 1.4);
-}
-
 /*
        Other stuff
 */
@@ -324,8 +305,6 @@ private:
        std::string m_infotext;
 };
 
-#include "inventory.h"
-
 // Prototype
 ItemCAO proto_ItemCAO(NULL, NULL);
 
@@ -537,49 +516,7 @@ void ItemCAO::initialize(const std::string &data)
 #include "genericobject.h"
 
 GenericCAO::GenericCAO(Client *client, ClientEnvironment *env):
-               ClientActiveObject(0, client, env),
-               //
-               m_is_player(false),
-               m_is_local_player(false),
-               //
-               m_smgr(NULL),
-               m_irr(NULL),
-               m_client(NULL),
-               m_selection_box(-BS/3.,-BS/3.,-BS/3., BS/3.,BS/3.,BS/3.),
-               m_meshnode(NULL),
-               m_animated_meshnode(NULL),
-               m_wield_meshnode(NULL),
-               m_spritenode(NULL),
-               m_nametag(NULL),
-               m_position(v3f(0,10*BS,0)),
-               m_velocity(v3f(0,0,0)),
-               m_acceleration(v3f(0,0,0)),
-               m_yaw(0),
-               m_hp(1),
-               m_tx_size(1,1),
-               m_tx_basepos(0,0),
-               m_initial_tx_basepos_set(false),
-               m_tx_select_horiz_by_yawpitch(false),
-               m_animation_range(v2s32(0,0)),
-               m_animation_speed(15),
-               m_animation_blend(0),
-               m_animation_loop(true),
-               m_bone_position(UNORDERED_MAP<std::string, core::vector2d<v3f> >()),
-               m_attachment_bone(""),
-               m_attachment_position(v3f(0,0,0)),
-               m_attachment_rotation(v3f(0,0,0)),
-               m_attached_to_local(false),
-               m_anim_frame(0),
-               m_anim_num_frames(1),
-               m_anim_framelength(0.2),
-               m_anim_timer(0),
-               m_reset_textures_timer(-1),
-               m_previous_texture_modifier(""),
-               m_current_texture_modifier(""),
-               m_visuals_expired(false),
-               m_step_distance_counter(0),
-               m_last_light(255),
-               m_is_visible(false)
+               ClientActiveObject(0, client, env)
 {
        if (client == NULL) {
                ClientActiveObject::registerType(getType(), create);
@@ -623,7 +560,8 @@ void GenericCAO::initialize(const std::string &data)
                        m_is_visible = false;
                        player->setCAO(this);
                }
-               m_env->addPlayerName(m_name.c_str());
+               if (m_client->getProtoVersion() < 33)
+                       m_env->addPlayerName(m_name.c_str());
        }
 }
 
@@ -637,7 +575,7 @@ void GenericCAO::processInitData(const std::string &data)
        if (version == 1) { // In PROTOCOL_VERSION 14
                m_name = deSerializeString(is);
                m_is_player = readU8(is);
-               m_id = readS16(is);
+               m_id = readU16(is);
                m_position = readV3F1000(is);
                m_yaw = readF1000(is);
                m_hp = readS16(is);
@@ -666,7 +604,7 @@ void GenericCAO::processInitData(const std::string &data)
 
 GenericCAO::~GenericCAO()
 {
-       if (m_is_player) {
+       if (m_is_player && m_client->getProtoVersion() < 33) {
                m_env->removePlayerName(m_name.c_str());
        }
        removeFromScene(true);
@@ -705,26 +643,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++) {
@@ -1507,7 +1430,7 @@ void GenericCAO::updateBonePosition()
                return;
 
        m_animated_meshnode->setJointMode(irr::scene::EJUOR_CONTROL); // To write positions to the mesh on render
-       for(UNORDERED_MAP<std::string, core::vector2d<v3f> >::const_iterator
+       for(std::unordered_map<std::string, core::vector2d<v3f>>::const_iterator
                        ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii) {
                std::string bone_name = (*ii).first;
                v3f bone_pos = (*ii).second.X;
@@ -1585,13 +1508,7 @@ void GenericCAO::processMessage(const std::string &data)
                }
                if (m_is_local_player) {
                        LocalPlayer *player = m_env->getLocalPlayer();
-
                        player->makes_footstep_sound = m_prop.makes_footstep_sound;
-
-                       aabb3f collisionbox = m_selection_box;
-                       collisionbox.MinEdge += v3f(0, BS, 0);
-                       collisionbox.MaxEdge += v3f(0, BS, 0);
-                       player->setCollisionbox(collisionbox);
                }
 
                if ((m_is_player && !m_is_local_player) && m_prop.nametag == "")
@@ -1755,7 +1672,7 @@ void GenericCAO::processMessage(const std::string &data)
                                                m_smgr, m_env, m_position,
                                                m_prop.visual_size * BS);
                                m_env->addSimpleObject(simple);
-                       } else {
+                       } else if (m_reset_textures_timer < 0) {
                                // TODO: Execute defined fast response
                                // Flashing shall suffice as there is no definition
                                m_reset_textures_timer = 0.05;
@@ -1826,10 +1743,12 @@ bool GenericCAO::directReportPunch(v3f dir, const ItemStack *punchitem,
                }
                // TODO: Execute defined fast response
                // Flashing shall suffice as there is no definition
-               m_reset_textures_timer = 0.05;
-               if(result.damage >= 2)
-                       m_reset_textures_timer += 0.05 * result.damage;
-               updateTextures(m_current_texture_modifier + "^[brighten");
+               if (m_reset_textures_timer < 0) {
+                       m_reset_textures_timer = 0.05;
+                       if (result.damage >= 2)
+                               m_reset_textures_timer += 0.05 * result.damage;
+                       updateTextures(m_current_texture_modifier + "^[brighten");
+               }
        }
 
        return false;