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

[oweals/minetest.git] / src / content_mapblock.h

diff --git a/src/content_mapblock.h b/src/content_mapblock.h
index c8425024f11f0a2f7c2231290348085c07aa3145..2c6a4969e3a2c958b4a3e6b0c44c43a44363d1a6 100644 (file)
--- a/src/content_mapblock.h
+++ b/src/content_mapblock.h
@@ -60,12 +60,12 @@ public:
 // lighting
        void getSmoothLightFrame();
        u16 blendLight(const v3f &vertex_pos);
-       video::SColor blendLight(const v3f &vertex_pos, video::SColor tile_color);
-       video::SColor blendLight(const v3f &vertex_pos, const v3f &vertex_normal, video::SColor tile_color);
+       video::SColor blendLightColor(const v3f &vertex_pos);
+       video::SColor blendLightColor(const v3f &vertex_pos, const v3f &vertex_normal);
 
        void useTile(int index, bool disable_backface_culling);
        void useDefaultTile(bool set_color = true);
-       TileSpec getTile(const v3s16 &direction);
+       void getTile(const v3s16 &direction, TileSpec &tile);
 
 // face drawing
        void drawQuad(v3f *vertices, const v3s16 &normal = v3s16(0, 0, 0));
@@ -93,13 +93,12 @@ public:
        NeighborData liquid_neighbors[3][3];
        f32 corner_levels[2][2];
 
-       void prepareLiquidNodeDrawing(bool flowing);
-       void getLiquidNeighborhood(bool flowing);
-       void resetCornerLevels();
+       void prepareLiquidNodeDrawing();
+       void getLiquidNeighborhood();
        void calculateCornerLevels();
        f32 getCornerLevel(int i, int k);
-       void drawLiquidSides(bool flowing);
-       void drawLiquidTop(bool flowing);
+       void drawLiquidSides();
+       void drawLiquidTop();
 
 // raillike-specific
        // name of the group that enables connecting to raillike nodes of different kind
@@ -122,7 +121,7 @@ public:
                float offset_h, float offset_v = 0.0);
 
 // drawtypes
-       void drawLiquidNode(bool flowing);
+       void drawLiquidNode();
        void drawGlasslikeNode();
        void drawGlasslikeFramedNode();
        void drawAllfacesNode();