X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcontent_sao.h;h=53e701d8c3313c22d095fced8dc5217ee30fd5cc;hb=7d1ac4d1f6b53fb5e99ba86dd654d27b27146898;hp=e5b1223d466c68c54bf221d6ceff5c1beb2dde85;hpb=112b85d0fb97b896da977a3915dab73015681896;p=minetest.git

diff --git a/src/content_sao.h b/src/content_sao.h
index e5b1223d4..53e701d8c 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -22,120 +22,76 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "serverobject.h"
 #include "content_object.h"
+#include "itemgroup.h"
 
-class TestSAO : public ServerActiveObject
-{
-public:
-	TestSAO(ServerEnvironment *env, u16 id, v3f pos);
-	u8 getType() const
-		{return ACTIVEOBJECT_TYPE_TEST;}
-	static ServerActiveObject* create(ServerEnvironment *env, u16 id, v3f pos,
-			const std::string &data);
-	void step(float dtime, bool send_recommended);
-private:
-	float m_timer1;
-	float m_age;
-};
+ServerActiveObject* createItemSAO(ServerEnvironment *env, v3f pos,
+		const std::string itemstring);
 
-class ItemSAO : public ServerActiveObject
-{
-public:
-	ItemSAO(ServerEnvironment *env, u16 id, v3f pos,
-			const std::string inventorystring);
-	u8 getType() const
-		{return ACTIVEOBJECT_TYPE_ITEM;}
-	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* createInventoryItem();
-	InventoryItem* createPickedUpItem(){return createInventoryItem();}
-private:
-	std::string m_inventorystring;
-	v3f m_speed_f;
-	v3f m_last_sent_position;
-	IntervalLimiter m_move_interval;
-};
+/*
+	LuaEntitySAO
+	
+	This is the only SAO that needs to have a bunch of it's internals exposed.
+*/
 
-class RatSAO : public ServerActiveObject
-{
-public:
-	RatSAO(ServerEnvironment *env, u16 id, v3f pos);
-	u8 getType() const
-		{return ACTIVEOBJECT_TYPE_RAT;}
-	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;
-};
+struct LuaEntityProperties;
 
-class Oerkki1SAO : public ServerActiveObject
+class LuaEntitySAO : public ServerActiveObject
 {
 public:
-	Oerkki1SAO(ServerEnvironment *env, u16 id, v3f pos);
+	LuaEntitySAO(ServerEnvironment *env, v3f pos,
+			const std::string &name, const std::string &state);
+	~LuaEntitySAO();
 	u8 getType() const
-		{return ACTIVEOBJECT_TYPE_OERKKI1;}
-	static ServerActiveObject* create(ServerEnvironment *env, u16 id, v3f pos,
+		{return ACTIVEOBJECT_TYPE_LUAENTITY;}
+	virtual void addedToEnvironment();
+	static ServerActiveObject* create(ServerEnvironment *env, v3f pos,
 			const std::string &data);
 	void step(float dtime, bool send_recommended);
 	std::string getClientInitializationData();
 	std::string getStaticData();
-	InventoryItem* createPickedUpItem(){return NULL;}
-	u16 punch(const std::string &toolname, v3f dir);
+	int punch(v3f dir,
+			const ToolCapabilities *toolcap=NULL,
+			ServerActiveObject *puncher=NULL,
+			float time_from_last_punch=1000000);
+	void rightClick(ServerActiveObject *clicker);
+	void setPos(v3f pos);
+	void moveTo(v3f pos, bool continuous);
+	float getMinimumSavedMovement();
+	std::string getDescription();
+	void setHP(s16 hp);
+	s16 getHP();
+	/* LuaEntitySAO-specific */
+	void setVelocity(v3f velocity);
+	v3f getVelocity();
+	void setAcceleration(v3f acceleration);
+	v3f getAcceleration();
+	void setYaw(float yaw);
+	float getYaw();
+	void setTextureMod(const std::string &mod);
+	void setSprite(v2s16 p, int num_frames, float framelength,
+			bool select_horiz_by_yawpitch);
+	std::string getName();
+	void setArmorGroups(const ItemGroupList &armor_groups);
 private:
-	void doDamage(u16 d);
+	void sendPosition(bool do_interpolate, bool is_movement_end);
 
-	bool m_is_active;
-	IntervalLimiter m_inactive_interval;
-	v3f m_speed_f;
-	v3f m_oldpos;
-	v3f m_last_sent_position;
+	std::string m_init_name;
+	std::string m_init_state;
+	bool m_registered;
+	struct LuaEntityProperties *m_prop;
+	
+	s16 m_hp;
+	v3f m_velocity;
+	v3f m_acceleration;
 	float m_yaw;
-	float m_counter1;
-	float m_counter2;
-	float m_age;
-	bool m_touching_ground;
-	u8 m_hp;
-	float m_after_jump_timer;
-};
+	ItemGroupList m_armor_groups;
 
-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;
+	float m_last_sent_yaw;
 	v3f m_last_sent_position;
-	float m_yaw;
-	float m_counter1;
-	float m_counter2;
-	float m_age;
-	bool m_touching_ground;
+	v3f m_last_sent_velocity;
+	float m_last_sent_position_timer;
+	float m_last_sent_move_precision;
+	bool m_armor_groups_sent;
 };
 
 #endif