X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclientobject.h;h=2d0089bcfc7f65580bd22a79091b1b2d6d41d21a;hb=81385682c8c1da90f2366452b10e20a93c0865fb;hp=50fae67c287bb7f20f194256ec08d9e06e0f3d4a;hpb=fd7a0735c9aeaa7978190049319e3cdfe48920a4;p=minetest.git

diff --git a/src/clientobject.h b/src/clientobject.h
index 50fae67c2..2d0089bcf 100644
--- a/src/clientobject.h
+++ b/src/clientobject.h
@@ -36,14 +36,19 @@ Some planning
 */
 
 class ClientEnvironment;
+class ITextureSource;
+class IGameDef;
+class LocalPlayer;
+struct ItemStack;
 
 class ClientActiveObject : public ActiveObject
 {
 public:
-	ClientActiveObject(u16 id);
+	ClientActiveObject(u16 id, IGameDef *gamedef, ClientEnvironment *env);
 	virtual ~ClientActiveObject();
 
-	virtual void addToScene(scene::ISceneManager *smgr){}
+	virtual void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
+			IrrlichtDevice *irr){}
 	virtual void removeFromScene(){}
 	// 0 <= light_at_pos <= LIGHT_SUN
 	virtual void updateLight(u8 light_at_pos){}
@@ -51,6 +56,7 @@ class ClientActiveObject : public ActiveObject
 	virtual core::aabbox3d<f32>* getSelectionBox(){return NULL;}
 	virtual core::aabbox3d<f32>* getCollisionBox(){return NULL;}
 	virtual v3f getPosition(){return v3f(0,0,0);}
+	virtual bool doShowSelectionBox(){return true;}
 	
 	// Step object in time
 	virtual void step(float dtime, ClientEnvironment *env){}
@@ -59,7 +65,8 @@ class ClientActiveObject : public ActiveObject
 	virtual void processMessage(const std::string &data){}
 
 	virtual std::string infoText() {return "";}
-
+	virtual std::string debugInfoText() {return "";}
+	
 	/*
 		This takes the return value of
 		ServerActiveObject::getClientInitializationData
@@ -67,12 +74,20 @@ class ClientActiveObject : public ActiveObject
 	virtual void initialize(const std::string &data){}
 	
 	// Create a certain type of ClientActiveObject
-	static ClientActiveObject* create(u8 type);
+	static ClientActiveObject* create(u8 type, IGameDef *gamedef,
+			ClientEnvironment *env);
+
+	// If returns true, punch will not be sent to the server
+	virtual bool directReportPunch(v3f dir, const ItemStack *punchitem=NULL,
+			float time_from_last_punch=1000000)
+	{ return false; }
 
 protected:
 	// Used for creating objects based on type
-	typedef ClientActiveObject* (*Factory)();
+	typedef ClientActiveObject* (*Factory)(IGameDef *gamedef, ClientEnvironment *env);
 	static void registerType(u16 type, Factory f);
+	IGameDef *m_gamedef;
+	ClientEnvironment *m_env;
 private:
 	// Used for creating objects based on type
 	static core::map<u16, Factory> m_types;
@@ -95,78 +110,5 @@ struct DistanceSortedActiveObject
 	}
 };
 
-/*
-	TestCAO
-*/
-
-class TestCAO : public ClientActiveObject
-{
-public:
-	TestCAO();
-	virtual ~TestCAO();
-	
-	u8 getType() const
-	{
-		return ACTIVEOBJECT_TYPE_TEST;
-	}
-	
-	static ClientActiveObject* create();
-
-	void addToScene(scene::ISceneManager *smgr);
-	void removeFromScene();
-	void updateLight(u8 light_at_pos);
-	v3s16 getLightPosition();
-	void updateNodePos();
-
-	void step(float dtime, ClientEnvironment *env);
-
-	void processMessage(const std::string &data);
-
-private:
-	scene::IMeshSceneNode *m_node;
-	v3f m_position;
-};
-
-/*
-	ItemCAO
-*/
-
-class ItemCAO : public ClientActiveObject
-{
-public:
-	ItemCAO();
-	virtual ~ItemCAO();
-	
-	u8 getType() const
-	{
-		return ACTIVEOBJECT_TYPE_ITEM;
-	}
-	
-	static ClientActiveObject* create();
-
-	void addToScene(scene::ISceneManager *smgr);
-	void removeFromScene();
-	void updateLight(u8 light_at_pos);
-	v3s16 getLightPosition();
-	void updateNodePos();
-
-	void step(float dtime, ClientEnvironment *env);
-
-	void processMessage(const std::string &data);
-
-	void initialize(const std::string &data);
-	
-	core::aabbox3d<f32>* getSelectionBox()
-		{return &m_selection_box;}
-	v3f getPosition()
-		{return m_position;}
-
-private:
-	core::aabbox3d<f32> m_selection_box;
-	scene::IMeshSceneNode *m_node;
-	v3f m_position;
-	std::string m_inventorystring;
-};
-
 #endif