codestyle

Author: Coronia

src/Ext/Bullet/Hooks.DetonateLogics.cpp

@@ -260,8 +260,8 @@ DEFINE_HOOK(0x469C46, BulletClass_Logics_DamageAnimSelected, 0x8)
 	if (pAnimType)
 	{
 		auto const pWHExt = WarheadTypeExt::ExtMap.Find(pThis->WH);
-		int cellHeight = MapClass::Instance.GetCellFloorHeight(*coords);
-		auto newCrds = pWHExt->PlayAnimAboveSurface ? CoordStruct{ coords->X, coords->Y, Math::max(cellHeight, coords->Z) } : *coords;
+		const int cellHeight = MapClass::Instance.GetCellFloorHeight(*coords);
+		auto const newCrds = pWHExt->PlayAnimAboveSurface ? CoordStruct{ coords->X, coords->Y, Math::max(cellHeight, coords->Z) } : *coords;
 
 		if (cellHeight > newCrds.Z && !pWHExt->PlayAnimUnderground)
 		{
@@ -795,31 +795,32 @@ DEFINE_HOOK(0x469453, BulletClass_Logics_TemporalUnderGround, 0x6)
 
 	GET(FootClass*, pTarget, EAX);
 
-	Layer layer = pTarget->InWhichLayer();
-
-	if (layer != Layer::None)
+	if (pTarget->InWhichLayer() != Layer::None)
 		return OK;
 
 	return NotOK;
 }
 
 DEFINE_HOOK(0x4899DA, MapClass_DamageArea_DamageUnderGround, 0x7)
 {
-	GET_STACK(bool, isNullified, STACK_OFFSET(0xE0, -0xC9));
+	GET_STACK(const bool, isNullified, STACK_OFFSET(0xE0, -0xC9));
 	GET_STACK(int, damage, STACK_OFFSET(0xE0, -0xBC));
 	GET_STACK(CoordStruct*, pCrd, STACK_OFFSET(0xE0, -0xB8));
 	GET_BASE(WarheadTypeClass*, pWH, 0xC);
 	GET_BASE(TechnoClass*, pSrcTechno, 0x8);
 	GET_BASE(HouseClass*, pSrcHouse, 0x14);
 	GET_STACK(bool, hitted, STACK_OFFSET(0xE0, -0xC1)); // bHitted = true
 
+	if (isNullified)
+		return 0;
+
 	auto const pWHExt = WarheadTypeExt::ExtMap.Find(pWH);
 
-	if (isNullified || !pWHExt || !pWHExt->AffectsUnderground)
+	if (!pWHExt || !pWHExt->AffectsUnderground)
 		return 0;
 
 	// bool cylinder = pWHExt->CellSpread_Cylinder;
-	float spread = pWH->CellSpread;
+	const float spread = pWH->CellSpread;
 
 	for (auto const& pTechno : ScenarioExt::Global()->UndergroundTracker)
 	{
@@ -829,14 +830,14 @@ DEFINE_HOOK(0x4899DA, MapClass_DamageArea_DamageUnderGround, 0x7)
 			&& !pTechno->InLimbo)
 		{
 			double dist = 0.0;
-			auto technoCoords = pTechno->GetCoords();
+			auto const technoCoords = pTechno->GetCoords();
 
 			//if (cylinder)
 			//	dist = CoordStruct{ technoCoords.X - pCrd->X, technoCoords.Y - pCrd->Y, 0 }.Magnitude();
 			//else
 				dist = technoCoords.DistanceFrom(*pCrd);
 
-			if (dist <= spread * 256)
+			if (dist <= spread * Unsorted::LeptonsPerCell)
 			{
 				pTechno->ReceiveDamage(&damage, (int)dist, pWH, pSrcTechno, false, false, pSrcHouse);
 				hitted = true;
@@ -848,6 +849,4 @@ DEFINE_HOOK(0x4899DA, MapClass_DamageArea_DamageUnderGround, 0x7)
 	return 0;
 }
 
-
-
-#pragma endregion
+#pragma endregion

src/Ext/Techno/Hooks.Firing.cpp

@@ -453,18 +453,23 @@ DEFINE_HOOK(0x6FC749, TechnoClass_GetFireError_AntiUnderground, 0x5)
 {
 	enum { Illegal = 0x6FC86A, GoOtherChecks = 0x6FC762 };
 
-	GET(Layer, layer, EAX);
-	//GET(TechnoClass*, pThis, EBX);
+	GET(const Layer, layer, EAX);
 	GET(WeaponTypeClass*, pWeapon, EDI);
 
-	auto const pProj = pWeapon->Projectile;
-	auto const pProjExt = BulletTypeExt::ExtMap.Find(pProj);
-
-	if (layer == Layer::Underground && !pProjExt->AU)
-		return Illegal;
-
-	if ((layer == Layer::Air || layer == Layer::Top) && !pProj->AA)
-		return Illegal;
+	switch (layer)
+	{
+	case Layer::Air:
+	case Layer::Top:
+		if (!pWeapon->Projectile->AA)
+			return Illegal;
+		break;
+	case Layer::Underground:
+		if (!BulletTypeExt::ExtMap.Find(pWeapon->Projectile)->AU)
+			return Illegal;
+		break;
+	default:
+		break;
+	}
 
 	return GoOtherChecks;
 }

src/Ext/Techno/Hooks.cpp

@@ -1309,7 +1309,7 @@ DEFINE_HOOK(0x70023B, TechnoClass_MouseOverObject_AttackUnderGround, 0x5)
 
 	GET(ObjectClass*, pObject, EDI);
 	GET(TechnoClass*, pThis, ESI);
-	GET(int, wpIdx, EAX);
+	GET(const int, wpIdx, EAX);
 
 	if (pObject->IsSurfaced())
 		return FireIsOK;
@@ -1326,7 +1326,7 @@ DEFINE_HOOK(0x728F9A, TunnelLocomotionClass_Process_Track, 0x7)
 	GET(ILocomotion*, pThis, ESI);
 
 	const auto pLoco = static_cast<TunnelLocomotionClass*>(pThis);
-	auto pTechno = pLoco->LinkedTo;
+	const auto pTechno = pLoco->LinkedTo;
 	ScenarioExt::Global()->UndergroundTracker.AddUnique(pTechno);
 	TechnoExt::ExtMap.Find(pTechno)->UndergroundTracked = true;
 
@@ -1346,7 +1346,7 @@ DEFINE_HOOK(0x7297F6, TunnelLocomotionClass_ProcessDigging_Track, 0x7)
 DEFINE_HOOK(0x772AB3, WeaponTypeClass_AllowedThreats_AU, 0x5)
 {
 	GET(BulletTypeClass* const, pType, ECX);
-	GET(ThreatType, flags, EAX);
+	GET(const ThreatType, flags, EAX);
 
 	if (BulletTypeExt::ExtMap.Find(pType)->AU)
 		R->EAX(static_cast<unsigned int>(flags) | 0x20000u);
@@ -1361,7 +1361,7 @@ namespace SelectAutoTarget_Context
 
 DEFINE_HOOK(0x6F8DF0, TechnoClass_SelectAutoTarget_Start_AU, 0x9)
 {
-	GET_STACK(unsigned int, flags, 0x4);
+	GET_STACK(const unsigned int, flags, 0x4);
 	SelectAutoTarget_Context::AU = (flags & 0x20000u) != 0;
 	return 0;
 }
@@ -1453,7 +1453,7 @@ DEFINE_HOOK(0x6F7E1E, TechnoClass_CanAutoTargetObject_AU, 0x6)
 	enum { Continue = 0x6F7E24, ReturnFalse = 0x6F894F };
 
 	GET(TechnoClass*, pTarget, ESI);
-	GET(int, height, EAX);
+	GET(const int, height, EAX);
 
 	return height >= -20 || SelectAutoTarget_Context::AU || TechnoExt::ExtMap.Find(pTarget)->SpecialTracked ? Continue : ReturnFalse;
 }