Optimize the use of GetTechnoType() in 85669c3

Author: CrimRecya

src/Ext/Techno/Hooks.Misc.cpp

@@ -767,32 +767,34 @@ DEFINE_HOOK(0x70FB73, FootClass_IsBunkerableNow_Dehardcode, 0x6)
 
 DEFINE_HOOK(0x730D1F, DeployCommandClass_Execute_VoiceDeploy, 0x5)
 {
-	GET_STACK(int, unitsToDeploy, STACK_OFFSET(0x18, -0x4));
+	GET_STACK(const int, unitsToDeploy, STACK_OFFSET(0x18, -0x4));
 
 	if (unitsToDeploy != 1)
 		return 0;
 
 	GET(TechnoClass* const, pThis, ESI);
-	auto const whatAmI = pThis->WhatAmI();
+
+	const auto whatAmI = pThis->WhatAmI();
 
 	if (whatAmI == AbstractType::Infantry)
 	{
-		auto pInfantry = static_cast<InfantryClass*>(pThis);
+		const auto pInfantry = static_cast<InfantryClass*>(pThis);
 
 		if (!pInfantry->IsDeploying)
 		{
 			if (pInfantry->IsDeployed())
-				pThis->QueueVoice(pThis->GetTechnoType()->VoiceUndeploy);
+				pThis->QueueVoice(pInfantry->Type->VoiceUndeploy);
 			else
-				pThis->QueueVoice(pThis->GetTechnoType()->VoiceDeploy);
+				pThis->QueueVoice(pInfantry->Type->VoiceDeploy);
 		}
 	}
 	else if (whatAmI == AbstractType::Unit)
 	{
-		auto pUnit = static_cast<UnitClass*>(pThis);
+		const auto pUnit = static_cast<UnitClass*>(pThis);
+		const auto pType = pUnit->Type;
 
-		if (pUnit->TryToDeploy() || pUnit->Type->IsSimpleDeployer)
-			pThis->QueueVoice(pThis->GetTechnoType()->VoiceDeploy);
+		if (pUnit->TryToDeploy() || pType->IsSimpleDeployer)
+			pThis->QueueVoice(pType->VoiceDeploy);
 	}
 
 	return 0;

src/Ext/Unit/Hooks.Crushing.cpp

@@ -6,7 +6,7 @@
 #include <Utilities/Macro.h>
 #include <Utilities/TemplateDef.h>
 
-DEFINE_HOOK(0x073B05B, UnitClass_PerCellProcess_TiltWhenCrushes, 0x6)
+DEFINE_HOOK(0x73B05B, UnitClass_PerCellProcess_TiltWhenCrushes, 0x6)
 {
 	enum { SkipGameCode = 0x73B074 };
 
@@ -22,7 +22,7 @@ DEFINE_HOOK(0x073B05B, UnitClass_PerCellProcess_TiltWhenCrushes, 0x6)
 	return SkipGameCode;
 }
 
-DEFINE_HOOK(0x0741941, UnitClass_OverrunSquare_TiltWhenCrushes, 0x6)
+DEFINE_HOOK(0x741941, UnitClass_OverrunSquare_TiltWhenCrushes, 0x6)
 {
 	enum { SkipGameCode = 0x74195E };
 
@@ -91,7 +91,7 @@ DEFINE_HOOK(0x6A108D, ShipLocomotionClass_WhileMoving_CrushTilt, 0xD)
 {
 	enum { SkipGameCode = 0x6A109A };
 
-	GET(DriveLocomotionClass*, pThis, EBP);
+	GET(ShipLocomotionClass*, pThis, EBP);
 
 	auto const pLinkedTo = pThis->LinkedTo;
 	auto const pTypeExt = TechnoTypeExt::ExtMap.Find(pLinkedTo->GetTechnoType());