Tooltips: Unify the tooltip[] and list[] description tooltip display functions (...

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

diff --git a/src/hud.cpp b/src/hud.cpp
index 3e4162b6432bf47a94e4f6225bec7254d60fc320..a2f031b4c4a7ca0974f820c674587495c7a05912 100644 (file)
--- a/src/hud.cpp
+++ b/src/hud.cpp
@@ -626,7 +626,7 @@ void Hud::resizeHotbar() {
 }
 
 struct MeshTimeInfo {
-       s64 time;
+       u64 time;
        scene::IMesh *mesh;
 };
 
@@ -698,7 +698,10 @@ void drawItemStack(video::IVideoDriver *driver,
                                if (p->override_base)
                                        c = p->color;
                        }
-                       colorizeMeshBuffer(buf, &c);
+                       if (imesh->needs_shading)
+                               colorizeMeshBuffer(buf, &c);
+                       else
+                               setMeshBufferColor(buf, c);
                        video::SMaterial &material = buf->getMaterial();
                        material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
                        material.Lighting = false;