X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclientobject.h;h=233617b5c1c5ffc29f5267c60550c8f89c0a3849;hb=ee7af21e411d5d43ba67f4b67603f72e62b0570d;hp=c90648483005105d11ccab1db507ac8008074256;hpb=af05e4b2defde537f3b953a7dae0ef44fae225aa;p=minetest.git

diff --git a/src/clientobject.h b/src/clientobject.h
index c90648483..233617b5c 100644
--- a/src/clientobject.h
+++ b/src/clientobject.h
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -20,8 +20,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CLIENTOBJECT_HEADER
 #define CLIENTOBJECT_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "activeobject.h"
+#include <map>
 
 /*
 
@@ -36,21 +37,35 @@ 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 removeFromScene(){}
+	virtual void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
+			IrrlichtDevice *irr){}
+	virtual void removeFromScene(bool permanent){}
 	// 0 <= light_at_pos <= LIGHT_SUN
 	virtual void updateLight(u8 light_at_pos){}
 	virtual v3s16 getLightPosition(){return v3s16(0,0,0);}
 	virtual core::aabbox3d<f32>* getSelectionBox(){return NULL;}
-	virtual core::aabbox3d<f32>* getCollisionBox(){return NULL;}
+	virtual bool getCollisionBox(aabb3f *toset){return false;}
+	virtual bool collideWithObjects(){return false;}
 	virtual v3f getPosition(){return v3f(0,0,0);}
+	virtual scene::IMeshSceneNode *getMeshSceneNode(){return NULL;}
+	virtual scene::IAnimatedMeshSceneNode *getAnimatedMeshSceneNode(){return NULL;}
+	virtual scene::IBillboardSceneNode *getSpriteSceneNode(){return NULL;}
+	virtual bool isPlayer(){return false;}
+	virtual bool isLocalPlayer(){return false;}
+	virtual void setAttachments(){}
+	virtual bool doShowSelectionBox(){return true;}
+	virtual void updateCameraOffset(v3s16 camera_offset){};
 	
 	// Step object in time
 	virtual void step(float dtime, ClientEnvironment *env){}
@@ -59,7 +74,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,15 +83,23 @@ 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;
+	static std::map<u16, Factory> m_types;
 };
 
 struct DistanceSortedActiveObject
@@ -89,7 +113,7 @@ struct DistanceSortedActiveObject
 		d = a_d;
 	}
 
-	bool operator < (DistanceSortedActiveObject &other)
+	bool operator < (const DistanceSortedActiveObject &other) const
 	{
 		return d < other.d;
 	}