Remove texture atlas / AtlasPointer, rename getTextureRaw to getTexture

[dragonfireclient.git] / src / nodedef.h

diff --git a/src/nodedef.h b/src/nodedef.h
index 8be18f9cb2f2502c79f799bf81cde725fb978699..665a5ddc23d062205a911f99ce779a2e8e5f8cc5 100644 (file)
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -133,8 +133,6 @@ enum NodeDrawType
        NDT_LIQUID, // Do not draw face towards same kind of flowing/source liquid
        NDT_FLOWINGLIQUID, // A very special kind of thing
        NDT_GLASSLIKE, // Glass-like, don't draw faces towards other glass
-       NDT_GLASSLIKE_FRAMED, // Glass-like, draw connected frames and all all visible faces
-                                                 // uses 2 textures, one for frames, second for faces
        NDT_ALLFACES, // Leaves-like, draw all faces no matter what
        NDT_ALLFACES_OPTIONAL, // Fancy -> allfaces, fast -> normal
        NDT_TORCHLIKE,
@@ -143,6 +141,9 @@ enum NodeDrawType
        NDT_FENCELIKE,
        NDT_RAILLIKE,
        NDT_NODEBOX,
+       NDT_GLASSLIKE_FRAMED, // Glass-like, draw connected frames and all all
+                             // visible faces
+                                                 // uses 2 textures, one for frames, second for faces
 };
 
 #define CF_SPECIAL_COUNT 2
@@ -218,6 +219,7 @@ struct ContentFeatures
        u8 liquid_viscosity;
        // Is liquid renewable (new liquid source will be created between 2 existing)
        bool liquid_renewable;
+       bool drowning;
        // Amount of light the node emits
        u8 light_source;
        u32 damage_per_second;
@@ -310,7 +312,6 @@ class IWritableNodeDefManager : public INodeDefManager
 
        /*
                Update tile textures to latest return values of TextueSource.
-               Call after updating the texture atlas of a TextureSource.
        */
        virtual void updateTextures(ITextureSource *tsrc)=0;