Remove useless recalculation of bounding box (mapblock_mesh)

[minetest.git] / src / content_sao.h

diff --git a/src/content_sao.h b/src/content_sao.h
index 065c6a0397da31d040afc1c139ac5926dd7cf07d..dca02bb00ba5e2e6cbb55b56072fe182f0a8e87f 100644 (file)
--- a/src/content_sao.h
+++ b/src/content_sao.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
@@ -78,6 +78,7 @@ class LuaEntitySAO : public ServerActiveObject
        void setSprite(v2s16 p, int num_frames, float framelength,
                        bool select_horiz_by_yawpitch);
        std::string getName();
+       bool getCollisionBox(aabb3f *toset);
 private:
        std::string getPropertyPacket();
        void sendPosition(bool do_interpolate, bool is_movement_end);
@@ -100,7 +101,7 @@ class LuaEntitySAO : public ServerActiveObject
        float m_last_sent_position_timer;
        float m_last_sent_move_precision;
        bool m_armor_groups_sent;
-       
+
        v2f m_animation_range;
        float m_animation_speed;
        float m_animation_blend;
@@ -147,6 +148,8 @@ class PlayerSAO : public ServerActiveObject
        void setBasePosition(const v3f &position);
        void setPos(v3f pos);
        void moveTo(v3f pos, bool continuous);
+       void setYaw(float);
+       void setPitch(float);
 
        /*
                Interaction interface
@@ -233,6 +236,8 @@ class PlayerSAO : public ServerActiveObject
                m_is_singleplayer = is_singleplayer;
        }
 
+       bool getCollisionBox(aabb3f *toset);
+
 private:
        std::string getPropertyPacket();
        
@@ -252,8 +257,6 @@ class PlayerSAO : public ServerActiveObject
        ItemGroupList m_armor_groups;
        bool m_armor_groups_sent;
 
-
-
        bool m_properties_sent;
        struct ObjectProperties m_prop;
        // Cached privileges for enforcement
@@ -280,6 +283,11 @@ class PlayerSAO : public ServerActiveObject
        bool m_inventory_not_sent;
        bool m_hp_not_sent;
        bool m_wielded_item_not_sent;
+
+       float m_physics_override_speed;
+       float m_physics_override_jump;
+       float m_physics_override_gravity;
+       bool m_physics_override_sent;
 };
 
 #endif