diff options
| author | Dániel Juhász <juhdanad@gmail.com> | 2017-04-21 15:34:59 +0200 |
|---|---|---|
| committer | Zeno- <kde.psych@gmail.com> | 2017-04-21 23:34:59 +1000 |
| commit | 1ffb180868ffcec6812cd3aac8f56ffefb91c8bc (patch) | |
| tree | 2b7dc1d209bda384fbd995dc7f13ffdd3587818f /src/hud.cpp | |
| parent | 2ad74a9e8b9da48aef62346de6cd55f304c6440d (diff) | |
| download | minetest-1ffb180868ffcec6812cd3aac8f56ffefb91c8bc.tar.gz minetest-1ffb180868ffcec6812cd3aac8f56ffefb91c8bc.tar.bz2 minetest-1ffb180868ffcec6812cd3aac8f56ffefb91c8bc.zip | |
Soft node overlay (#5186)
This commit adds node overlays, which are tiles that are drawn on top of
other tiles.
Diffstat (limited to 'src/hud.cpp')
| -rw-r--r-- | src/hud.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/hud.cpp b/src/hud.cpp index f558acf1e..c482912e9 100644 --- a/src/hud.cpp +++ b/src/hud.cpp @@ -687,8 +687,9 @@ void drawItemStack(video::IVideoDriver *driver, assert(buf->getHardwareMappingHint_Vertex() == scene::EHM_NEVER); video::SColor c = basecolor; if (imesh->buffer_colors.size() > j) { - std::pair<bool, video::SColor> p = imesh->buffer_colors[j]; - c = p.first ? p.second : basecolor; + ItemPartColor *p = &imesh->buffer_colors[j]; + if (p->override_base) + c = p->color; } colorizeMeshBuffer(buf, &c); video::SMaterial &material = buf->getMaterial(); |