Updated InputFunction to use Function's copy constructor.

Author: jordanbriere

addons/source-python/packages/source-python/entities/classes.py

@@ -573,7 +573,7 @@ def fget(pointer):
                 (DataType.POINTER, DataType.POINTER),
                 DataType.VOID)
 
-            return InputFunction(desc, make_object(BaseEntity, pointer))
+            return InputFunction(desc, function, make_object(BaseEntity, pointer))
 
         return property(fget)
 

src/core/modules/entities/entities_datamaps.cpp

@@ -209,13 +209,8 @@ Vector VariantExt::get_vector(variant_t *pVariant)
 // ============================================================================
 // >> CInputFunction
 // ============================================================================
-CInputFunction::CInputFunction(typedescription_t pTypeDesc, CBaseEntity *pBaseEntity)
-	:CFunction(
-		(unsigned long)TypeDescriptionSharedExt::get_function(pTypeDesc),
-		object(CONV_THISCALL),
-		make_tuple(DATA_TYPE_POINTER, DATA_TYPE_POINTER),
-		object(DATA_TYPE_VOID)
-	)
+CInputFunction::CInputFunction(typedescription_t pTypeDesc, CFunction &pFunc, CBaseEntity *pBaseEntity)
+	:CFunction(pFunc)
 {
 	if (!(pTypeDesc.flags & FTYPEDESC_INPUT))
 		BOOST_RAISE_EXCEPTION(PyExc_TypeError, "\"%s\" is not an input.", pTypeDesc.fieldName);

src/core/modules/entities/entities_datamaps.h

@@ -89,7 +89,7 @@ class VariantExt
 class CInputFunction: public CFunction
 {
 public:
-	CInputFunction(typedescription_t pTypeDesc, CBaseEntity *pBaseEntity);
+	CInputFunction(typedescription_t pTypeDesc, CFunction &pFunc, CBaseEntity *pBaseEntity);
 	void __call__(object value, CBaseEntity *pActivator, CBaseEntity *pCaller);
 
 public:

src/core/modules/entities/entities_datamaps_wrap.cpp

@@ -234,12 +234,14 @@ void export_input_function(scope _datamaps)
 {
 	class_<CInputFunction, bases<CFunction>, boost::noncopyable> InputFunction(
 		"InputFunction",
-		init<typedescription_t, CBaseEntity*>(
-			args("self", "desc", "entity"),
+		init<typedescription_t, CFunction &, CBaseEntity*>(
+			args("self", "desc", "function", "entity"),
 			"Instantiate the function instance and store the base attributes.\n"
 			"\n"
 			":param TypeDescription desc:\n"
 			"	The descriptor of the input bound to this instance.\n"
+			":param Function function:\n"
+			"	The function of the input.\n"
 			":param BaseEntity entity:\n"
 			"	The entity this input is bound to.\n"
 			"\n"