Log unhandled exceptions in connectionthreads to errorstream

[dragonfireclient.git] / src / clientobject.h

diff --git a/src/clientobject.h b/src/clientobject.h
index 613c635a2dcf2df84a495f6eeb87489230bc23f6..cae551abc5740451fe77edb69ec00b2f7cbabe08 100644 (file)
--- a/src/clientobject.h
+++ b/src/clientobject.h
@@ -55,33 +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);
@@ -120,4 +120,3 @@ struct DistanceSortedActiveObject
 };
 
 #endif
-