Commented out debug statements again

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

diff --git a/src/content_sao.h b/src/content_sao.h
index 030232a9ee05317fc8e0173d1a58984968645041..060c18341e2479c7827173542024f07074f3ada5 100644 (file)
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -51,6 +51,7 @@ public:
        std::string getStaticData();
        InventoryItem* createInventoryItem();
        InventoryItem* createPickedUpItem(){return createInventoryItem();}
+       void rightClick(Player *player);
 private:
        std::string m_inventorystring;
        v3f m_speed_f;
@@ -113,6 +114,30 @@ private:
        float m_after_jump_timer;
 };
 
+class FireflySAO : public ServerActiveObject
+{
+public:
+       FireflySAO(ServerEnvironment *env, u16 id, v3f pos);
+       u8 getType() const
+               {return ACTIVEOBJECT_TYPE_FIREFLY;}
+       static ServerActiveObject* create(ServerEnvironment *env, u16 id, v3f pos,
+                       const std::string &data);
+       void step(float dtime, bool send_recommended);
+       std::string getClientInitializationData();
+       std::string getStaticData();
+       InventoryItem* createPickedUpItem();
+private:
+       bool m_is_active;
+       IntervalLimiter m_inactive_interval;
+       v3f m_speed_f;
+       v3f m_oldpos;
+       v3f m_last_sent_position;
+       float m_yaw;
+       float m_counter1;
+       float m_counter2;
+       float m_age;
+       bool m_touching_ground;
+};
 
 #endif