Variant.get/set_entity methods and InputData.activator/caller attributes are now accepting BaseEntity instances.

Author: L'In20Cible

src/core/modules/entities/entities_datamaps.cpp

@@ -175,75 +175,45 @@ void* TypeDescriptionSharedExt::get_function(const typedescription_t& pTypeDesc)
 
 
 // ============================================================================
-// >> VariantSharedExt
+// >> VariantExt
 // ============================================================================
-const char* VariantSharedExt::get_string(variant_t *pVariant)
+const char* VariantExt::get_string(variant_t *pVariant)
 {
 	return STRING(pVariant->StringID());
 }
 
-void VariantSharedExt::set_string(variant_t *pVariant, const char *szValue)
+void VariantExt::set_string(variant_t *pVariant, const char *szValue)
 {
 	return pVariant->SetString(MAKE_STRING(szValue));
 }
 
-Color* VariantSharedExt::get_color(variant_t *pVariant)
+Color* VariantExt::get_color(variant_t *pVariant)
 {
 	color32 pColor32 = pVariant->Color32();
 	return new Color((int)pColor32.r, (int)pColor32.g, (int)pColor32.b, (int)pColor32.a);
 }
 
-void VariantSharedExt::set_color(variant_t *pVariant, Color *pColor)
+void VariantExt::set_color(variant_t *pVariant, Color *pColor)
 {
 	pVariant->SetColor32(pColor->r(), pColor->g(), pColor->b(), pColor->a());
 }
 
-Vector VariantSharedExt::get_vector(variant_t *pVariant)
+Vector VariantExt::get_vector(variant_t *pVariant)
 {
 	Vector pVector;
 	pVariant->Vector3D(pVector);
 	return pVector;
 }
 
-unsigned int VariantSharedExt::get_entity(variant_t *pVariant)
-{
-	return ExcIndexFromBaseHandle(pVariant->Entity());
-}
-
-void VariantSharedExt::set_entity(variant_t *pVariant, unsigned int uiEntity)
-{
-	pVariant->SetEntity(ExcBaseEntityFromIndex(uiEntity));
-}
-
 
 // ============================================================================
-// >> InputDataSharedExt
+// >> InputDataExt
 // ============================================================================
-inputdata_t* InputDataSharedExt::__init__()
+inputdata_t* InputDataExt::__init__()
 {
 	inputdata_t *pInputData = new inputdata_t;
 	pInputData->pActivator = NULL;
 	pInputData->pCaller = NULL;
 	pInputData->nOutputID = 0;
 	return pInputData;
 }
-
-unsigned int InputDataSharedExt::get_activator(const inputdata_t& pInputData)
-{
-	return ExcIndexFromBaseEntity(pInputData.pActivator);
-}
-
-void InputDataSharedExt::set_activator(inputdata_t *pInputData, unsigned int uiActivator)
-{
-	pInputData->pActivator = ExcBaseEntityFromIndex(uiActivator);
-}
-
-unsigned int InputDataSharedExt::get_caller(const inputdata_t& pInputData)
-{
-	return ExcIndexFromBaseEntity(pInputData.pCaller);
-}
-	
-void InputDataSharedExt::set_caller(inputdata_t *pInputData, unsigned int uiCaller)
-{
-	pInputData->pCaller = ExcBaseEntityFromIndex(uiCaller);
-}

src/core/modules/entities/entities_datamaps.h

@@ -72,30 +72,24 @@ class TypeDescriptionSharedExt
 //-----------------------------------------------------------------------------
 // varian_t extension class.
 //-----------------------------------------------------------------------------
-class VariantSharedExt
+class VariantExt
 {
 public:
 	static const char* get_string(variant_t *pVariant);
 	static void set_string(variant_t *pVariant, const char *szValue);
 	static Color* get_color(variant_t *pVariant);
 	static void set_color(variant_t *pVariant, Color *pColor);
 	static Vector get_vector(variant_t *pVariant);
-	static unsigned int get_entity(variant_t *pVariant);
-	static void set_entity(variant_t *pVariant, unsigned int uiEntity);
 };
 
 
 //-----------------------------------------------------------------------------
 // inputdata_t extension class.
 //-----------------------------------------------------------------------------
-class InputDataSharedExt
+class InputDataExt
 {
 public:
 	static inputdata_t* __init__();
-	static unsigned int get_activator(const inputdata_t& pInputData);
-	static void set_activator(inputdata_t *pInputData, unsigned int uiActivator);
-	static unsigned int get_caller(const inputdata_t& pInputData);
-	static void set_caller(inputdata_t *pInputData, unsigned int uiCaller);
 };
 
 

src/core/modules/entities/entities_datamaps_wrap.cpp

@@ -172,11 +172,11 @@ void export_input_data(scope _datamaps)
 	class_<inputdata_t, inputdata_t *> InputData("InputData");
 
 	// Initializers...
-	InputData.def("__init__", make_constructor(&InputDataSharedExt::__init__));
+	InputData.def("__init__", make_constructor(&InputDataExt::__init__));
 
 	// Properties...
-	InputData.add_property("activator", &InputDataSharedExt::get_activator, &InputDataSharedExt::set_activator);
-	InputData.add_property("caller", &InputDataSharedExt::get_caller, &InputDataSharedExt::set_caller);
+	InputData.def_readwrite("activator", &inputdata_t::pActivator);
+	InputData.def_readwrite("caller", &inputdata_t::pCaller);
 
 	InputData.def_readwrite("value", &inputdata_t::value);
 	InputData.def_readwrite("output_index", &inputdata_t::nOutputID);
@@ -198,26 +198,26 @@ void export_variant(scope _datamaps)
 
 	// Getters...
 	Variant.def("get_bool", &variant_t::Bool);
-	Variant.def("get_string", &VariantSharedExt::get_string);
+	Variant.def("get_string", &VariantExt::get_string);
 	Variant.def("get_int", &variant_t::Int);
 	Variant.def("get_float", &variant_t::Float);
 
 	Variant.def("get_color",
-		&VariantSharedExt::get_color,
+		&VariantExt::get_color,
 		manage_new_object_policy()
 	);
 
-	Variant.def("get_vector", &VariantSharedExt::get_vector);
-	Variant.def("get_entity", &VariantSharedExt::get_entity);
+	Variant.def("get_vector", &VariantExt::get_vector);
+	Variant.def("get_entity", &variant_t::Entity, reference_existing_object_policy());
 
 	// Setters...
 	Variant.def("set_bool", &variant_t::SetBool);
-	Variant.def("set_string", &VariantSharedExt::set_string);
+	Variant.def("set_string", &VariantExt::set_string);
 	Variant.def("set_int", &variant_t::SetInt);
 	Variant.def("set_float", &variant_t::SetFloat);
-	Variant.def("set_color", &VariantSharedExt::set_color);
+	Variant.def("set_color", &VariantExt::set_color);
 	Variant.def("set_vector", &variant_t::SetVector3D);
-	Variant.def("set_entity", &VariantSharedExt::set_entity);
+	Variant.def("set_entity", &variant_t::SetEntity);
 
 	// Add memory tools...
 	Variant ADD_MEM_TOOLS(variant_t);