Textureable sun and moon.

[dragonfireclient.git] / src / clientobject.h

diff --git a/src/clientobject.h b/src/clientobject.h
index 0d3ee3d30a48343dd510b68e91f807edc385f91e..233617b5c1c5ffc29f5267c60550c8f89c0a3849 100644 (file)
--- a/src/clientobject.h
+++ b/src/clientobject.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -20,8 +20,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CLIENTOBJECT_HEADER
 #define CLIENTOBJECT_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "activeobject.h"
+#include <map>
 
 /*
 
@@ -49,14 +50,22 @@ class ClientActiveObject : public ActiveObject
 
        virtual void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
                        IrrlichtDevice *irr){}
-       virtual void removeFromScene(){}
+       virtual void removeFromScene(bool permanent){}
        // 0 <= light_at_pos <= LIGHT_SUN
        virtual void updateLight(u8 light_at_pos){}
        virtual v3s16 getLightPosition(){return v3s16(0,0,0);}
        virtual core::aabbox3d<f32>* getSelectionBox(){return NULL;}
-       virtual core::aabbox3d<f32>* getCollisionBox(){return NULL;}
+       virtual bool getCollisionBox(aabb3f *toset){return false;}
+       virtual bool collideWithObjects(){return false;}
        virtual v3f getPosition(){return v3f(0,0,0);}
+       virtual scene::IMeshSceneNode *getMeshSceneNode(){return NULL;}
+       virtual scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode(){return NULL;}
+       virtual scene::IBillboardSceneNode *getSpriteSceneNode(){return NULL;}
+       virtual bool isPlayer(){return false;}
+       virtual bool isLocalPlayer(){return false;}
+       virtual void setAttachments(){}
        virtual bool doShowSelectionBox(){return true;}
+       virtual void updateCameraOffset(v3s16 camera_offset){};
        
        // Step object in time
        virtual void step(float dtime, ClientEnvironment *env){}
@@ -90,7 +99,7 @@ class ClientActiveObject : public ActiveObject
        ClientEnvironment *m_env;
 private:
        // Used for creating objects based on type
-       static core::map<u16, Factory> m_types;
+       static std::map<u16, Factory> m_types;
 };
 
 struct DistanceSortedActiveObject
@@ -104,7 +113,7 @@ struct DistanceSortedActiveObject
                d = a_d;
        }
 
-       bool operator < (DistanceSortedActiveObject &other)
+       bool operator < (const DistanceSortedActiveObject &other) const
        {
                return d < other.d;
        }