Cleanup in content_mapblock (#5746)

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

diff --git a/src/content_cao.h b/src/content_cao.h
index a0601d692be8f0631ccf23eaf94975ed65684637..412cdff12eaeb1b1827ee4ae51f92a33f4c4ed4f 100644 (file)
--- a/src/content_cao.h
+++ b/src/content_cao.h
@@ -146,19 +146,8 @@ public:
 
        scene::ISceneNode *getSceneNode();
 
-       scene::IMeshSceneNode *getMeshSceneNode();
-
        scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode();
 
-       WieldMeshSceneNode *getWieldMeshSceneNode();
-
-       scene::IBillboardSceneNode *getSpriteSceneNode();
-
-       inline bool isPlayer() const
-       {
-               return m_is_player;
-       }
-
        inline bool isLocalPlayer() const
        {
                return m_is_local_player;
@@ -200,7 +189,9 @@ public:
 
        void updateTexturePos();
 
-       void updateTextures(const std::string &mod);
+       // std::string copy is mandatory as mod can be a class member and there is a swap
+       // on those class members
+       void updateTextures(std::string mod);
 
        void updateAnimation();