optimize usage of GetTechnoType()

- replace it with Type variable for Aircraft, Building, Infantry and Unit classes
- replace Find(techno->GetTechnoType()) with Find(techno)->TypeExtData

Author: Coronia

src/Commands/NextIdleHarvester.cpp

@@ -47,16 +47,15 @@ void NextIdleHarvesterCommandClass::Execute(WWKey eInput) const
 
 	do
 	{
-		if (auto pTechno = abstract_cast<TechnoClass*>(pNextObject))
+		if (auto const pTechno = abstract_cast<TechnoClass*>(pNextObject))
 		{
-			if (auto pTypeExt = TechnoTypeExt::ExtMap.Find(pTechno->GetTechnoType()))
+			auto const pTypeExt = TechnoExt::ExtMap.Find(pTechno)->TypeExtData;
+
+			if (pTypeExt->Harvester_Counted && !TechnoExt::IsHarvesting(pTechno))
 			{
-				if (pTypeExt->Harvester_Counted && !TechnoExt::IsHarvesting(pTechno))
-				{
-					pObjectToSelect = pNextObject;
-					idleHarvestersPresent = true;
-					break;
-				}
+				pObjectToSelect = pNextObject;
+				idleHarvestersPresent = true;
+				break;
 			}
 		}
 

src/Ext/Aircraft/Body.cpp

@@ -52,7 +52,7 @@ void AircraftExt::FireWeapon(AircraftClass* pThis, AbstractClass* pTarget)
 // Spy plane, airstrike etc.
 bool AircraftExt::PlaceReinforcementAircraft(AircraftClass* pThis, CellStruct edgeCell)
 {
-	auto const pTypeExt = TechnoTypeExt::ExtMap.Find(pThis->GetTechnoType());
+	auto const pTypeExt = TechnoTypeExt::ExtMap.Find(pThis->Type);
 	auto coords = CellClass::Cell2Coord(edgeCell);
 	coords.Z = 0;
 	AbstractClass* pTarget = nullptr;

src/Ext/Building/Hooks.Grinding.cpp

@@ -19,7 +19,7 @@ DEFINE_HOOK(0x43C30A, BuildingClass_ReceiveMessage_Grinding, 0x6)
 	const bool isAmphibious = movementZone == MovementZone::Amphibious || movementZone == MovementZone::AmphibiousCrusher
 		|| movementZone == MovementZone::AmphibiousDestroyer;
 
-	if (!isAmphibious && (pThis->GetTechnoType()->Naval != pFromType->Naval))
+	if (!isAmphibious && (pThis->Type->Naval != pFromType->Naval))
 		return ReturnNegative;
 
 	if (pThis->Type->Grinding)
@@ -146,7 +146,7 @@ DEFINE_HOOK(0x740134, UnitClass_WhatAction_Grinding, 0x0)
 		{
 			if (pThis->SendCommand(RadioCommand::QueryCanEnter, pTarget) == RadioCommand::AnswerPositive)
 			{
-				bool isFlying = pThis->GetTechnoType()->MovementZone == MovementZone::Fly;
+				bool isFlying = pThis->Type->MovementZone == MovementZone::Fly;
 				bool canBeGrinded = BuildingExt::CanGrindTechno(pBuilding, pThis);
 				action = pBuilding->Type->Grinding ? canBeGrinded && !isFlying ? Action::Repair : Action::NoEnter : !isFlying ? Action::Enter : Action::NoEnter;
 				R->EBX(action);

src/Ext/Building/Hooks.Selling.cpp

@@ -11,7 +11,7 @@ DEFINE_HOOK(0x4D9F7B, FootClass_Sell, 0x6)
 
 	if (pThis->Owner->IsControlledByCurrentPlayer())
 	{
-		const auto pTypeExt = TechnoTypeExt::ExtMap.Find(pThis->GetTechnoType());
+		const auto pTypeExt = TechnoExt::ExtMap.Find(pThis)->TypeExtData;
 		VoxClass::PlayIndex(pTypeExt->EVA_Sold.Get(VoxClass::FindIndex(GameStrings::EVA_UnitSold)));
 		//WW used VocClass::PlayGlobal to play the SellSound, why did they do that?
 		VocClass::PlayAt(pTypeExt->SellSound.Get(RulesClass::Instance->SellSound), pThis->Location);

src/Ext/Bullet/Body.cpp

@@ -21,7 +21,7 @@ void BulletExt::ExtData::InterceptBullet(TechnoClass* pSource, WeaponTypeClass*
 	auto pTypeExt = this->TypeExtData;
 	bool canAffect = false;
 	bool isIntercepted = false;
-	const auto pTechnoTypeExt = TechnoTypeExt::ExtMap.Find(pSource->GetTechnoType());
+	const auto pTechnoTypeExt = TechnoExt::ExtMap.Find(pSource)->TypeExtData;
 	const auto pInterceptorType = pTechnoTypeExt->InterceptorType.get();
 
 	if (pTypeExt->Armor.isset())

src/Ext/CaptureManager/Body.cpp

@@ -7,12 +7,12 @@ bool CaptureManagerExt::CanCapture(CaptureManagerClass* pManager, TechnoClass* p
 	if (pManager->MaxControlNodes == 1)
 		return pManager->CanCapture(pTarget);
 
-	auto pTechnoTypeExt = TechnoTypeExt::ExtMap.Find(pManager->Owner->GetTechnoType());
+	const auto pTechnoTypeExt = TechnoExt::ExtMap.Find(pManager->Owner)->TypeExtData;
 	if (pTechnoTypeExt->MultiMindControl_ReleaseVictim)
 	{
 		// I hate Ares' completely rewritten things - secsome
 		pManager->MaxControlNodes += 1;
-		bool result = pManager->CanCapture(pTarget);
+		const bool result = pManager->CanCapture(pTarget);
 		pManager->MaxControlNodes -= 1;
 		return result;
 	}
@@ -132,7 +132,7 @@ bool CaptureManagerExt::CaptureUnit(CaptureManagerClass* pManager, AbstractClass
 	if (const auto pTarget = generic_cast<TechnoClass*>(pTechno))
 	{
 		bool bRemoveFirst = false;
-		if (auto pTechnoTypeExt = TechnoTypeExt::ExtMap.Find(pManager->Owner->GetTechnoType()))
+		if (const auto pTechnoTypeExt = TechnoExt::ExtMap.Find(pManager->Owner)->TypeExtData)
 			bRemoveFirst = pTechnoTypeExt->MultiMindControl_ReleaseVictim;
 
 		return CaptureManagerExt::CaptureUnit(pManager, pTarget, bRemoveFirst, pControlledAnimType, false, threatDelay);

src/Ext/CaptureManager/Hooks.cpp

@@ -1,6 +1,7 @@
 #include "Body.h"
 
 #include <ParticleSystemClass.h>
+#include <Ext/Techno/Body.h>
 #include <Utilities/Macro.h>
 #include <Utilities/EnumFunctions.h>
 
@@ -66,13 +67,13 @@ DEFINE_HOOK(0x4721E6, CaptureManagerClass_DrawLinkToVictim, 0x6)
 	GET_STACK(int, nNodeCount, STACK_OFFSET(0x30, -0x1C));
 
 	auto const pAttacker = pThis->Owner;
-	const auto pExt = TechnoTypeExt::ExtMap.Find(pAttacker->GetTechnoType());
+	auto const pExt = TechnoExt::ExtMap.Find(pAttacker)->TypeExtData;
 
 	if (EnumFunctions::CanTargetHouse(pExt->MindControlLink_VisibleToHouse, pAttacker->Owner, HouseClass::CurrentPlayer))
 	{
 		auto nVictimCoord = pVictim->Location;
 		nVictimCoord.Z += pVictim->GetTechnoType()->LeptonMindControlOffset;
-		auto nFLH = pAttacker->GetFLH(-1 - nNodeCount % 5, CoordStruct::Empty);
+		auto const nFLH = pAttacker->GetFLH(-1 - nNodeCount % 5, CoordStruct::Empty);
 		DrawALinkTo(nFLH, nVictimCoord, pAttacker->Owner->Color);
 	}
 
@@ -83,7 +84,7 @@ DEFINE_HOOK(0x4721E6, CaptureManagerClass_DrawLinkToVictim, 0x6)
 void __fastcall CaptureManagerClass_Overload_AI(CaptureManagerClass* pThis, void* _)
 {
 	auto const pOwner = pThis->Owner;
-	auto const pOwnerTypeExt = TechnoTypeExt::ExtMap.Find(pOwner->GetTechnoType());
+	auto const pOwnerTypeExt = TechnoExt::ExtMap.Find(pOwner)->TypeExtData;
 
 	if (!pOwnerTypeExt) // we cant find type Ext for this , just return to original function !
 	{

src/Ext/House/Hooks.UnitFromFactory.cpp

@@ -1,5 +1,6 @@
 #include <FactoryClass.h>
 
+#include <Ext/Techno/Body.h>
 #include <Ext/TechnoType/Body.h>
 #include <Utilities/EnumFunctions.h>
 #include <Utilities/GeneralUtils.h>
@@ -18,7 +19,7 @@ DEFINE_HOOK(0x4FB64B, HouseClass_UnitFromFactory_VoiceCreated, 0x5)
 	GET(TechnoClass* const, pThisTechno, ESI);
 	GET(FactoryClass* const, pThisFactory, EBX);
 
-	auto const pThisTechnoType = TechnoTypeExt::ExtMap.Find(pThisTechno->GetTechnoType());
+	auto const pThisTechnoType = TechnoExt::ExtMap.Find(pThisTechno)->TypeExtData;
 	if (pThisTechno->Owner->IsControlledByCurrentPlayer() && pThisTechnoType->VoiceCreated.isset())
 	{
 		if (RulesExt::Global()->IsVoiceCreatedGlobal.Get())

src/Ext/Infantry/Hooks.Firing.cpp

@@ -44,7 +44,7 @@ DEFINE_HOOK(0x5206D2, InfantryClass_FiringAI_SetContext, 0x6)
 
 	const auto pTarget = pThis->Target;
 	FiringAITemp::weaponIndex = WeaponIndex;
-	FiringAITemp::isSecondary = TechnoTypeExt::ExtMap.Find(pThis->GetTechnoType())->IsSecondary(WeaponIndex);
+	FiringAITemp::isSecondary = TechnoTypeExt::ExtMap.Find(pThis->Type)->IsSecondary(WeaponIndex);
 	FiringAITemp::WeaponType = pWeapon;
 	FiringAITemp::fireError = pThis->GetFireError(pTarget, WeaponIndex, true);
 	FiringAITemp::canFire = true;

src/Ext/Techno/Body.Internal.cpp

@@ -78,9 +78,9 @@ CoordStruct TechnoExt::GetBurstFLH(TechnoClass* pThis, int weaponIndex, bool& FL
 	FLHFound = false;
 	CoordStruct FLH = CoordStruct::Empty;
 
-	auto const pExt = TechnoTypeExt::ExtMap.Find(pThis->GetTechnoType());
+	auto const pExt = TechnoExt::ExtMap.Find(pThis)->TypeExtData;
 
-	auto pInf = abstract_cast<InfantryClass*, true>(pThis);
+	auto const pInf = abstract_cast<InfantryClass*, true>(pThis);
 	std::span<std::vector<CoordStruct>> pickedFLHs = pExt->WeaponBurstFLHs;
 
 	if (pThis->Veterancy.IsElite())
@@ -184,11 +184,10 @@ int TechnoExt::GetTintColor(TechnoClass* pThis, bool invulnerability, bool airst
 
 		if (airstrike)
 		{
-			if (auto const pAirstrike = TechnoExt::ExtMap.Find(pThis)->AirstrikeTargetingMe)
-			{
-				auto const pTypeExt = TechnoTypeExt::ExtMap.Find(pAirstrike->Owner->GetTechnoType());
-				tintColor |= pTypeExt->TintColorAirstrike;
-			}
+			auto const pExt =  TechnoExt::ExtMap.Find(pThis);
+
+			if (auto const pAirstrike = pExt->AirstrikeTargetingMe)
+				tintColor |= pExt->TypeExtData->TintColorAirstrike;
 		}
 
 		if (berserk && pThis->Berzerk)