Fix some small things

Author: CrimRecya

src/Ext/Bullet/Hooks.cpp

@@ -293,6 +293,9 @@ DEFINE_HOOK(0x46902C, BulletClass_Explode_Cluster, 0x6)
 constexpr bool CheckTrajectoryCanNotAlwaysSnap(const TrajectoryFlag flag)
 {
 	return flag != TrajectoryFlag::Invalid;
+/*	return flag == TrajectoryFlag::Straight
+		|| flag == TrajectoryFlag::Bombard
+		|| flag == TrajectoryFlag::Parabola;*/
 }
 
 DEFINE_HOOK(0x467CCA, BulletClass_AI_TargetSnapChecks, 0x6)

src/Ext/Bullet/Trajectories/StraightTrajectory.cpp

@@ -1046,11 +1046,14 @@ bool StraightTrajectory::PassAndConfineAtHeight(BulletClass* pBullet)
 	};
 
 	auto checkDifference = MapClass::Instance->GetCellFloorHeight(futureCoords) - futureCoords.Z;
-	const auto cellCoords = MapClass::Instance->GetCellAt(futureCoords)->GetCoordsWithBridge();
-	const auto differenceOnBridge = cellCoords.Z - futureCoords.Z;
 
-	if (std::abs(differenceOnBridge) < std::abs(checkDifference))
-		checkDifference = differenceOnBridge;
+	if (MapClass::Instance->GetCellAt(futureCoords)->ContainsBridge())
+	{
+		const auto differenceOnBridge = checkDifference + CellClass::BridgeHeight;
+
+		if (std::abs(differenceOnBridge) < std::abs(checkDifference))
+			checkDifference = differenceOnBridge;
+	}
 
 	// The height does not exceed the cliff, or the cliff can be ignored?
 	if (std::abs(checkDifference) < 384 || !pBullet->Type->SubjectToCliffs)

src/Ext/Techno/Hooks.ReceiveDamage.cpp

@@ -23,9 +23,10 @@ DEFINE_HOOK(0x701900, TechnoClass_ReceiveDamage_Shield, 0x6)
 	const auto pExt = TechnoExt::ExtMap.Find(pThis);
 	int nDamageLeft = *args->Damage;
 
+	// Raise Combat Alert
 	if (pRules->CombatAlert && nDamageLeft > 1)
 	{
-		auto raiseCombatAlert = [pThis, pExt, pRules, args]()
+		auto raiseCombatAlert = [&]()
 		{
 			const auto pHouse = pThis->Owner;
 
@@ -57,7 +58,7 @@ DEFINE_HOOK(0x701900, TechnoClass_ReceiveDamage_Shield, 0x6)
 
 			if (pRules->CombatAlert_SuppressIfInScreen)
 			{
-				TacticalClass* const pTactical = TacticalClass::Instance;
+				const auto pTactical = TacticalClass::Instance();
 				const auto coordInScreen = pTactical->CoordsToScreen(coordInMap) - pTactical->TacticalPos;
 				const auto screenArea = DSurface::Composite->GetRect();
 
@@ -84,6 +85,7 @@ DEFINE_HOOK(0x701900, TechnoClass_ReceiveDamage_Shield, 0x6)
 		raiseCombatAlert();
 	}
 
+	// Shield Receive Damage
 	if (!args->IgnoreDefenses)
 	{
 		if (const auto pShieldData = pExt->Shield.get())

src/Misc/Hooks.BugFixes.cpp

@@ -58,7 +58,7 @@ DEFINE_HOOK(0x62AA32, ParasiteClass_TryInfect_MissBehaviorFix, 0x5)
 	GET(bool, isReturnSuccess, EAX);
 	GET(ParasiteClass* const, pParasite, ESI);
 
-	auto pParasiteTechno = pParasite->Owner;
+	const auto pParasiteTechno = pParasite->Owner;
 
 	if (isReturnSuccess || !pParasiteTechno)
 		return 0;
@@ -68,12 +68,11 @@ DEFINE_HOOK(0x62AA32, ParasiteClass_TryInfect_MissBehaviorFix, 0x5)
 	if (!pType)
 		return 0;
 
-	auto cell = MapClass::Instance->NearByLocation(pParasiteTechno->LastMapCoords,
-				pType->SpeedType, -1, pType->MovementZone, false, 1, 1, false,
-				false, false, true, CellStruct::Empty, false, false);
-	auto crd = CellClass::Cell2Coord(cell);
-	isReturnSuccess = pParasiteTechno->Unlimbo(crd, DirType::North);
-	R->AL(isReturnSuccess);
+	const auto cell = MapClass::Instance->NearByLocation(pParasiteTechno->LastMapCoords, pType->SpeedType, -1,
+		pType->MovementZone, false, 1, 1, false, false, false, true, CellStruct::Empty, false, false);
+
+	if (cell != CellStruct::Empty) // Cell2Coord makes X/Y values of CoordStruct non-zero, additional checks are required
+		R->AL(pParasiteTechno->Unlimbo(CellClass::Cell2Coord(cell), DirType::North));
 
 	return 0;
 }