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 0586ef434def652116b1e78c9ff7d1400b14242f..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);
 
@@ -157,6 +159,7 @@ public:
        InventoryItem* createPickedUpItem(){return NULL;}
        u16 punch(const std::string &toolname, v3f dir,
                        const std::string &playername);
+       bool isPeaceful();
 private:
        void sendPosition();
        void setPropertyDefaults();
@@ -186,6 +189,8 @@ private:
        bool m_falling;
        float m_disturb_timer;
        std::string m_disturbing_player;
+       float m_random_disturb_timer;
+       float m_shoot_y;
        
        Settings *m_properties;
 };