Fix OSX building issue caused by ad884f2

[minetest.git] / src / clientobject.h

diff --git a/src/clientobject.h b/src/clientobject.h
index cae551abc5740451fe77edb69ec00b2f7cbabe08..be24e1388681e4776c9f537481457e5522124e7d 100644 (file)
--- a/src/clientobject.h
+++ b/src/clientobject.h
@@ -41,6 +41,7 @@ class ITextureSource;
 class IGameDef;
 class LocalPlayer;
 struct ItemStack;
+class WieldMeshSceneNode;
 
 class ClientActiveObject : public ActiveObject
 {
@@ -53,13 +54,16 @@ class ClientActiveObject : public ActiveObject
        virtual void removeFromScene(bool permanent){}
        // 0 <= light_at_pos <= LIGHT_SUN
        virtual void updateLight(u8 light_at_pos){}
+       virtual void updateLightNoCheck(u8 light_at_pos){}
        virtual v3s16 getLightPosition(){return v3s16(0,0,0);}
        virtual core::aabbox3d<f32>* getSelectionBox(){return NULL;}
        virtual bool getCollisionBox(aabb3f *toset){return false;}
        virtual bool collideWithObjects(){return false;}
        virtual v3f getPosition(){return v3f(0,0,0);}
+       virtual scene::ISceneNode *getSceneNode(){return NULL;}
        virtual scene::IMeshSceneNode *getMeshSceneNode(){return NULL;}
        virtual scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode(){return NULL;}
+       virtual WieldMeshSceneNode *getWieldMeshSceneNode(){return NULL;}
        virtual scene::IBillboardSceneNode *getSpriteSceneNode(){return NULL;}
        virtual bool isPlayer() const {return false;}
        virtual bool isLocalPlayer() const {return false;}
@@ -83,7 +87,7 @@ class ClientActiveObject : public ActiveObject
        virtual void initialize(const std::string &data){}
 
        // Create a certain type of ClientActiveObject
-       static ClientActiveObject* create(u8 type, IGameDef *gamedef,
+       static ClientActiveObject* create(ActiveObjectType type, IGameDef *gamedef,
                        ClientEnvironment *env);
 
        // If returns true, punch will not be sent to the server