Skip to content

Commit

Permalink
Document that object properties colors field is unused (#15685)
Browse files Browse the repository at this point in the history
  • Loading branch information
cx384 authored Feb 2, 2025
1 parent f17498b commit a8c4c55
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion doc/lua_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/client/content_cao.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1407,8 +1407,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
Expand Down
1 change: 0 additions & 1 deletion src/object_properties.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/object_properties.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ struct ObjectProperties
/* member variables ordered roughly by size */

std::vector<std::string> textures;
std::vector<video::SColor> colors;
std::vector<video::SColor> 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
Expand Down
1 change: 0 additions & 1 deletion src/server/player_sao.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a8c4c55

Please sign in to comment.