Set acceleration only once in falling node

[minetest.git] / src / clientobject.h

diff --git a/src/clientobject.h b/src/clientobject.h
index 1d88f991f51769864ca10f3abc4b4fa9f82b0647..3cc7c239156119c79eeaeb91f1d48edbf02632ab 100644 (file)
--- a/src/clientobject.h
+++ b/src/clientobject.h
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+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
@@ -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>
 
 /*
 
@@ -40,6 +41,7 @@ class ITextureSource;
 class IGameDef;
 class LocalPlayer;
 struct ItemStack;
+class WieldMeshSceneNode;
 
 class ClientActiveObject : public ActiveObject
 {
@@ -52,35 +54,40 @@ 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 core::aabbox3d<f32>* getCollisionBox(){return NULL;}
+       virtual aabb3f *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(){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,
+       static ClientActiveObject* create(ActiveObjectType type, IGameDef *gamedef,
                        ClientEnvironment *env);
 
        // If returns true, punch will not be sent to the server
@@ -96,7 +103,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 +117,10 @@ struct DistanceSortedActiveObject
                d = a_d;
        }
 
-       bool operator < (DistanceSortedActiveObject &other)
+       bool operator < (const DistanceSortedActiveObject &other) const
        {
                return d < other.d;
        }
 };
 
 #endif
-