Translated using Weblate (Japanese)

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

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 01be1422c8511139058080e6bfce368b31580bdd..de06e4d4bfd502d0392b80e1273e4e099090b8ad 100644 (file)
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -565,6 +565,7 @@ GenericCAO::GenericCAO(IGameDef *gamedef, ClientEnvironment *env):
                m_animation_range(v2s32(0,0)),
                m_animation_speed(15),
                m_animation_blend(0),
+               m_animation_loop(true),
                m_bone_position(std::map<std::string, core::vector2d<v3f> >()),
                m_attachment_bone(""),
                m_attachment_position(v3f(0,0,0)),
@@ -969,7 +970,7 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
        if (node && m_is_player && !m_is_local_player) {
                // Add a text node for showing the name
                gui::IGUIEnvironment* gui = irr->getGUIEnvironment();
-               std::wstring wname = narrow_to_wide(m_name);
+               std::wstring wname = utf8_to_wide(m_name);
                m_textnode = smgr->addTextSceneNode(gui->getSkin()->getFont(),
                                wname.c_str(), m_nametag_color, node);
                m_textnode->grab();
@@ -983,20 +984,38 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
 }
 
 void GenericCAO::updateLight(u8 light_at_pos)
+{
+       // Don't update light of attached one
+       if (getParent() != NULL) {
+               return;
+       }
+
+       updateLightNoCheck(light_at_pos);
+
+       // Update light of all children
+       for (std::vector<u16>::size_type i = 0; i < m_children.size(); i++) {
+               ClientActiveObject *obj = m_env->getActiveObject(m_children[i]);
+               if (obj) {
+                       obj->updateLightNoCheck(light_at_pos);
+               }
+       }
+}
+
+void GenericCAO::updateLightNoCheck(u8 light_at_pos)
 {
        u8 li = decode_light(light_at_pos);
-       if(li != m_last_light)
-       {
+       if (li != m_last_light) {
                m_last_light = li;
                video::SColor color(255,li,li,li);
-               if(m_meshnode)
+               if (m_meshnode) {
                        setMeshColor(m_meshnode->getMesh(), color);
-               if(m_animated_meshnode)
+               } else if (m_animated_meshnode) {
                        setMeshColor(m_animated_meshnode->getMesh(), color);
-               if(m_wield_meshnode)
+               } else if (m_wield_meshnode) {
                        m_wield_meshnode->setColor(color);
-               if(m_spritenode)
+               } else if (m_spritenode) {
                        m_spritenode->setColor(color);
+               }
        }
 }
 
@@ -1465,9 +1484,18 @@ void GenericCAO::updateAnimation()
 {
        if(m_animated_meshnode == NULL)
                return;
-       m_animated_meshnode->setFrameLoop(m_animation_range.X, m_animation_range.Y);
-       m_animated_meshnode->setAnimationSpeed(m_animation_speed);
+
+       if (m_animated_meshnode->getStartFrame() != m_animation_range.X ||
+               m_animated_meshnode->getEndFrame() != m_animation_range.Y)
+                       m_animated_meshnode->setFrameLoop(m_animation_range.X, m_animation_range.Y);
+       if (m_animated_meshnode->getAnimationSpeed() != m_animation_speed)
+               m_animated_meshnode->setAnimationSpeed(m_animation_speed);
        m_animated_meshnode->setTransitionTime(m_animation_blend);
+// Requires Irrlicht 1.8 or greater
+#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 8) || IRRLICHT_VERSION_MAJOR > 1
+       if (m_animated_meshnode->getLoopMode() != m_animation_loop)
+               m_animated_meshnode->setLoopMode(m_animation_loop);
+#endif
 }
 
 void GenericCAO::updateBonePosition()
@@ -1633,6 +1661,8 @@ void GenericCAO::processMessage(const std::string &data)
                        m_animation_range = v2s32((s32)range.X, (s32)range.Y);
                        m_animation_speed = readF1000(is);
                        m_animation_blend = readF1000(is);
+                       // these are sent inverted so we get true when the server sends nothing
+                       m_animation_loop = !readU8(is);
                        updateAnimation();
                } else {
                        LocalPlayer *player = m_env->getLocalPlayer();
@@ -1641,6 +1671,8 @@ void GenericCAO::processMessage(const std::string &data)
                                m_animation_range = v2s32((s32)range.X, (s32)range.Y);
                                m_animation_speed = readF1000(is);
                                m_animation_blend = readF1000(is);
+                               // these are sent inverted so we get true when the server sends nothing
+                               m_animation_loop = !readU8(is);
                        }
                        // update animation only if local animations present
                        // and received animation is unknown (except idle animation)
@@ -1788,7 +1820,7 @@ std::string GenericCAO::debugInfoText()
        os<<"GenericCAO hp="<<m_hp<<"\n";
        os<<"armor={";
        for(ItemGroupList::const_iterator i = m_armor_groups.begin();
-                       i != m_armor_groups.end(); i++)
+                       i != m_armor_groups.end(); ++i)
        {
                os<<i->first<<"="<<i->second<<", ";
        }