Improve glass

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

diff --git a/src/mapnode.h b/src/mapnode.h
index 70a7638d258b88ee37b8a1363ebb34bcdcc33f56..12dbf45c52fe18b1b47e8a6b22cf86b71939fb76 100644 (file)
--- a/src/mapnode.h
+++ b/src/mapnode.h
@@ -20,14 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MAPNODE_HEADER
 #define MAPNODE_HEADER
 
-#include <iostream>
 #include "irrlichttypes.h"
 #include "light.h"
-#include "exceptions.h"
-#include "serialization.h"
-#ifndef SERVER
-#include "tile.h"
-#endif
 
 class INodeDefManager;
 
@@ -62,6 +56,7 @@ typedef u16 content_t;
 */
 #define CONTENT_AIR 126
 
+#ifndef SERVER
 /*
        Nodes make a face if contents differ and solidness differs.
        Return value:
@@ -72,6 +67,7 @@ typedef u16 content_t;
 */
 u8 face_contents(content_t m1, content_t m2, bool *equivalent,
                INodeDefManager *nodemgr);
+#endif
 
 /*
        Packs directions like (1,0,0), (1,-1,0) in six bits.
@@ -213,18 +209,6 @@ struct MapNode
                return mix;
        }*/
 
-       // In mapnode.cpp
-#ifndef SERVER
-       /*
-               Get tile of a face of the node.
-               dir: direction of face
-               Returns: TileSpec. Can contain miscellaneous texture coordinates,
-                        which must be obeyed so that the texture atlas can be used.
-       */
-       TileSpec getTile(v3s16 dir, ITextureSource *tsrc,
-                       INodeDefManager *nodemgr) const;
-#endif
-       
        /*
                Gets mineral content of node, if there is any.
                MINERAL_NONE if doesn't contain or isn't able to contain mineral.