Fix water-glass and water-lava surfaces

[oweals/minetest.git] / src / content_sao.h

diff --git a/src/content_sao.h b/src/content_sao.h
index 078feb273f4838775ad4e44f19ec0f150b6d420e..f0ebf4f6fbe3b02822ba35d3e74f08b785835b84 100644 (file)
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -96,7 +96,9 @@ public:
        std::string getClientInitializationData();
        std::string getStaticData();
        InventoryItem* createPickedUpItem(){return NULL;}
-       u16 punch(const std::string &toolname, v3f dir);
+       u16 punch(const std::string &toolname, v3f dir,
+                       const std::string &playername);
+       bool isPeaceful(){return false;}
 private:
        void doDamage(u16 d);
 
@@ -155,8 +157,11 @@ public:
        std::string getClientInitializationData();
        void step(float dtime, bool send_recommended);
        InventoryItem* createPickedUpItem(){return NULL;}
-       u16 punch(const std::string &toolname, v3f dir);
+       u16 punch(const std::string &toolname, v3f dir,
+                       const std::string &playername);
+       bool isPeaceful();
 private:
+       void sendPosition();
        void setPropertyDefaults();
        void readProperties();
        void updateProperties();
@@ -182,6 +187,10 @@ private:
        float m_die_age;
        v2f m_size;
        bool m_falling;
+       float m_disturb_timer;
+       std::string m_disturbing_player;
+       float m_random_disturb_timer;
+       float m_shoot_y;
        
        Settings *m_properties;
 };