update

Author: TaranDahl

src/Interop/AttachEffect.cpp

@@ -4,10 +4,10 @@
 #include "New/Type/AttachEffectTypeClass.h"
 
 int __stdcall AE_Attach(
-	void* pTarget,
-	void* pInvokerHouse,
-	void* pInvoker,
-	void* pSource,
+	TechnoClass* pTarget,
+	HouseClass* pInvokerHouse,
+	TechnoClass* pInvoker,
+	AbstractClass* pSource,
 	const char** effectTypeNames,
 	int typeCount,
 	int durationOverride,
@@ -19,11 +19,6 @@ int __stdcall AE_Attach(
 	if (!pTarget || !effectTypeNames || typeCount <= 0)
 		return 0;
 
-	TechnoClass* pTargetTechno = static_cast<TechnoClass*>(pTarget);
-	HouseClass* pInvokerHouseClass = static_cast<HouseClass*>(pInvokerHouse);
-	TechnoClass* pInvokerTechno = static_cast<TechnoClass*>(pInvoker);
-	AbstractClass* pSourceAbs = static_cast<AbstractClass*>(pSource);
-
 	AEAttachInfoTypeClass attachInfo;
 
 	for (int i = 0; i < typeCount; i++)
@@ -50,20 +45,18 @@ int __stdcall AE_Attach(
 	if (recreationDelay >= -1)
 		attachInfo.RecreationDelays.push_back(recreationDelay);
 
-	return AttachEffectClass::Attach(pTargetTechno, pInvokerHouseClass, pInvokerTechno, pSourceAbs, attachInfo);
+	return AttachEffectClass::Attach(pTarget, pInvokerHouse, pInvoker, pSource, attachInfo);
 }
 
 int __stdcall AE_Detach(
-	void* pTarget,
+	TechnoClass* pTarget,
 	const char** effectTypeNames,
 	int typeCount
 )
 {
 	if (!pTarget || !effectTypeNames || typeCount <= 0)
 		return 0;
 
-	TechnoClass* pTargetTechno = static_cast<TechnoClass*>(pTarget);
-
 	AEAttachInfoTypeClass detachInfo;
 
 	for (int i = 0; i < typeCount; i++)
@@ -78,20 +71,18 @@ int __stdcall AE_Detach(
 	if (detachInfo.RemoveTypes.empty())
 		return 0;
 
-	return AttachEffectClass::Detach(pTargetTechno, detachInfo);
+	return AttachEffectClass::Detach(pTarget, detachInfo);
 }
 
 int __stdcall AE_DetachByGroups(
-	void* pTarget,
+	TechnoClass* pTarget,
 	const char** groupNames,
 	int groupCount
 )
 {
 	if (!pTarget || !groupNames || groupCount <= 0)
 		return 0;
 
-	TechnoClass* pTargetTechno = static_cast<TechnoClass*>(pTarget);
-
 	AEAttachInfoTypeClass detachInfo;
 
 	for (int i = 0; i < groupCount; i++)
@@ -103,19 +94,16 @@ int __stdcall AE_DetachByGroups(
 	if (detachInfo.RemoveGroups.empty())
 		return 0;
 
-	return AttachEffectClass::DetachByGroups(pTargetTechno, detachInfo);
+	return AttachEffectClass::DetachByGroups(pTarget, detachInfo);
 }
 
 void __stdcall AE_TransferEffects(
-	void* pSource,
-	void* pTarget
+	TechnoClass* pSource,
+	TechnoClass* pTarget
 )
 {
 	if (!pSource || !pTarget)
 		return;
 
-	TechnoClass* pSourceTechno = static_cast<TechnoClass*>(pSource);
-	TechnoClass* pTargetTechno = static_cast<TechnoClass*>(pTarget);
-
-	AttachEffectClass::TransferAttachedEffects(pSourceTechno, pTargetTechno);
+	AttachEffectClass::TransferAttachedEffects(pSource, pTarget);
 }

src/Interop/AttachEffect.h

@@ -1,12 +1,19 @@
 #pragma once
 
+#include <TechnoClass.h>
+#include <HouseClass.h>
+#include <AbstractClass.h>
+
 extern "C"
 {
+	/// <summary>
+	/// Attaches AttachEffect instances to a target unit.
+	/// </summary>
 	__declspec(dllexport) int __stdcall AE_Attach(
-		void* pTarget,
-		void* pInvokerHouse,
-		void* pInvoker,
-		void* pSource,
+		TechnoClass* pTarget,
+		HouseClass* pInvokerHouse,
+		TechnoClass* pInvoker,
+		AbstractClass* pSource,
 		const char** effectTypeNames,
 		int typeCount,
 		int durationOverride,
@@ -15,20 +22,29 @@ extern "C"
 		int recreationDelay
 	);
 
+	/// <summary>
+	/// Removes AttachEffect instances matching given types from a unit.
+	/// </summary>
 	__declspec(dllexport) int __stdcall AE_Detach(
-		void* pTarget,
+		TechnoClass* pTarget,
 		const char** effectTypeNames,
 		int typeCount
 	);
 
+	/// <summary>
+	/// Removes AttachEffect instances matching given groups from a unit.
+	/// </summary>
 	__declspec(dllexport) int __stdcall AE_DetachByGroups(
-		void* pTarget,
+		TechnoClass* pTarget,
 		const char** groupNames,
 		int groupCount
 	);
 
+	/// <summary>
+	/// Transfers AttachEffect instances from one unit to another.
+	/// </summary>
 	__declspec(dllexport) void __stdcall AE_TransferEffects(
-		void* pSource,
-		void* pTarget
+		TechnoClass* pSource,
+		TechnoClass* pTarget
 	);
 }

src/Interop/TechnoExt.cpp

@@ -1,10 +1,7 @@
 #include "TechnoExt.h"
 #include <Ext/Techno/Body.h>
 
-extern "C" __declspec(dllexport) bool __stdcall ConvertToType_Phobos(void* pThis, void* toType)
+extern "C" __declspec(dllexport) bool __stdcall ConvertToType_Phobos(FootClass* pThis, TechnoTypeClass* toType)
 {
-	auto pTechno = static_cast<FootClass*>(pThis);
-	auto pType = static_cast<TechnoTypeClass*>(toType);
-
-	return TechnoExt::ConvertToType(pTechno, pType);
+	return TechnoExt::ConvertToType(pThis, toType);
 }

src/Interop/TechnoExt.h

@@ -1,6 +1,15 @@
 #pragma once
 
+#include <TechnoTypeClass.h>
+#include <FootClass.h>
+
 extern "C"
 {
-	__declspec(dllexport) bool __stdcall ConvertToType_Phobos(void* pThis, void* toType);
+	/// <summary>
+	/// Converts a unit to a different type.
+	/// </summary>
+	/// <param name="pThis">Pointer to the FootClass instance to convert</param>
+	/// <param name="toType">Pointer to the target TechnoTypeClass</param>
+	/// <returns>true if conversion was successful, false otherwise</returns>
+	__declspec(dllexport) bool __stdcall ConvertToType_Phobos(FootClass* pThis, TechnoTypeClass* toType);
 }