diff --git a/doc/lua_api.md b/doc/lua_api.md index cf269cf6cf000..2402390ea15aa 100644 --- a/doc/lua_api.md +++ b/doc/lua_api.md @@ -9236,7 +9236,7 @@ Player properties need to be saved manually. -- Deprecated usage of "wielditem" expects 'textures = {itemname}' (see 'visual' above). colors = {}, - -- Number of required colors depends on visual + -- Currently unused. use_texture_alpha = false, -- Use texture's alpha channel. diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp index 5c044ddeffdbc..45b418a6af4f8 100644 --- a/src/client/content_cao.cpp +++ b/src/client/content_cao.cpp @@ -1404,8 +1404,8 @@ void GenericCAO::updateTextures(std::string mod) }); } // Set mesh color (only if lighting is disabled) - if (!m_prop.colors.empty() && m_prop.glow < 0) - setMeshColor(mesh, m_prop.colors[0]); + if (m_prop.glow < 0) + setMeshColor(mesh, {255, 255, 255, 255}); } } // Prevent showing the player after changing texture diff --git a/src/object_properties.cpp b/src/object_properties.cpp index 63a0ef01bc438..15305265f4d26 100644 --- a/src/object_properties.cpp +++ b/src/object_properties.cpp @@ -16,7 +16,6 @@ static const video::SColor NULL_BGCOLOR{0, 1, 1, 1}; ObjectProperties::ObjectProperties() { textures.emplace_back("no_texture.png"); - colors.emplace_back(255,255,255,255); } std::string ObjectProperties::dump() const diff --git a/src/object_properties.h b/src/object_properties.h index d97b4997eb369..9e261be78480e 100644 --- a/src/object_properties.h +++ b/src/object_properties.h @@ -16,7 +16,7 @@ struct ObjectProperties /* member variables ordered roughly by size */ std::vector textures; - std::vector colors; + std::vector colors; // Currently unused // Values are BS=1 aabb3f collisionbox = aabb3f(-0.5f, -0.5f, -0.5f, 0.5f, 0.5f, 0.5f); // Values are BS=1 diff --git a/src/server/player_sao.cpp b/src/server/player_sao.cpp index 5d6b891fa95fe..449dbc6cf44c7 100644 --- a/src/server/player_sao.cpp +++ b/src/server/player_sao.cpp @@ -32,7 +32,6 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, session_t p m_prop.textures.emplace_back("player.png"); m_prop.textures.emplace_back("player_back.png"); m_prop.colors.clear(); - m_prop.colors.emplace_back(255, 255, 255, 255); m_prop.spritediv = v2s16(1,1); m_prop.eye_height = 1.625f; // End of default appearance