Log unhandled exceptions in connectionthreads to errorstream

[dragonfireclient.git] / src / clientobject.h

diff --git a/src/clientobject.h b/src/clientobject.h
index d1ee366cfebaee991a45ddd608280b0e5934384e..cae551abc5740451fe77edb69ec00b2f7cbabe08 100644 (file)
--- a/src/clientobject.h
+++ b/src/clientobject.h
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "irrlichttypes_extrabloated.h"
 #include "activeobject.h"
+#include <map>
 
 /*
 
@@ -54,31 +55,33 @@ class ClientActiveObject : public ActiveObject
        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 bool isPlayer() const {return false;}
+       virtual bool isLocalPlayer() const {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){}
-       
+
        // Process a message sent by the server side object
        virtual void processMessage(const std::string &data){}
 
        virtual std::string infoText() {return "";}
        virtual std::string debugInfoText() {return "";}
-       
+
        /*
                This takes the return value of
                ServerActiveObject::getClientInitializationData
        */
        virtual void initialize(const std::string &data){}
-       
+
        // Create a certain type of ClientActiveObject
        static ClientActiveObject* create(u8 type, IGameDef *gamedef,
                        ClientEnvironment *env);
@@ -96,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
@@ -110,11 +113,10 @@ struct DistanceSortedActiveObject
                d = a_d;
        }
 
-       bool operator < (DistanceSortedActiveObject &other)
+       bool operator < (const DistanceSortedActiveObject &other) const
        {
                return d < other.d;
        }
 };
 
 #endif
-