Merge branch 'develop' into BalloonHoverPathingFix

Author: TaranDahl

CREDITS.md

@@ -390,6 +390,7 @@ This page lists all the individual contributions to the project by their author.
   - Fix the bug that `AllowAirstrike=no` cannot completely prevent air strikes from being launched against it
   - Fix the bug that infantry ignored `Passengers` and `SizeLimit` when entering buildings
   - Tiberium eater logic
+  - Fix the bug that ships can travel on elevated bridges
 - **Apollo** - Translucent SHP drawing patches
 - **ststl**:
   - Customizable `ShowTimer` priority of superweapons

docs/Fixed-or-Improved-Logics.md

@@ -224,6 +224,7 @@ This page describes all ingame logics that are fixed or improved in Phobos witho
 - Fixed the issue where computer players did not search for new enemies after defeating them or forming alliances with them.
 - Fixed the bug that infantry ignored `Passengers` and `SizeLimit` when entering buildings.
 - Fixed `VoiceDeploy` not played, when deployed through hot-key/command bar.
+- Fixed the bug that ships can travel on elevated bridges.
 - Fixed the bug where technos with `BalloonHover=yes` incorrectly considered ground factors when setting the destination and distributing moving commands. If you don't want this anyway, use `[General]->BalloonHoverPathingFix=false` to disable this fix.
 
 ## Fixes / interactions with other extensions

docs/Whats-New.md

@@ -395,6 +395,7 @@ Vanilla fixes:
 - Fixed the bug that buildings will always be tinted as airstrike owner (by NetsuNegi)
 - Fixed the issue where computer players did not search for new enemies after defeating them or forming alliances with them (by FlyStar)
 - Fixed the bug that infantry ignored `Passengers` and `SizeLimit` when entering buildings (by NetsuNegi)
+- Fixed the bug that ships can travel on elevated bridges (by NetsuNegi)
 - Fix BalloonHover incorrectly considering ground factors when pathfinding
 
 Phobos fixes:

src/Ext/SWType/FireSuperWeapon.cpp

@@ -76,10 +76,8 @@ inline void LimboCreate(BuildingTypeClass* pType, HouseClass* pOwner, int ID)
 		pBuilding->DiscoveredBy(pOwner);
 
 		pOwner->RegisterGain(pBuilding, false);
-		pOwner->UpdatePower();
 		pOwner->RecheckTechTree = true;
 		pOwner->RecheckPower = true;
-		pOwner->RecheckRadar = true;
 		pOwner->Buildings.AddItem(pBuilding);
 
 		// Different types of building logics

src/Ext/Techno/Body.Update.cpp

@@ -305,7 +305,9 @@ void TechnoExt::ExtData::EatPassengers()
 					}
 
 					// Handle gunner change.
-					if (pThis->GetTechnoType()->Gunner)
+					auto const pTransportType = pThis->GetTechnoType();
+
+					if (pTransportType->Gunner)
 					{
 						if (auto const pFoot = abstract_cast<FootClass*>(pThis))
 						{
@@ -327,6 +329,13 @@ void TechnoExt::ExtData::EatPassengers()
 					pPassenger->KillPassengers(pSource);
 					pPassenger->RegisterDestruction(pSource);
 					pPassenger->UnInit();
+
+					// Handle extra power
+					if (auto const pBldType = abstract_cast<BuildingTypeClass*, true>(pTransportType))
+					{
+						if (pBldType->ExtraPowerBonus || pBldType->ExtraPowerDrain)
+							pThis->Owner->RecheckPower = true;
+					}
 				}
 
 				this->PassengerDeletionTimer.Stop();
@@ -868,6 +877,11 @@ void TechnoExt::KillSelf(TechnoClass* pThis, AutoDeathBehavior deathOption, Anim
 
 		pThis->RegisterKill(pThis->Owner);
 		pThis->UnInit();
+
+		// Handle extra power
+		if (pThis->Absorbed && pThis->Transporter)
+			pThis->Transporter->Owner->RecheckPower = true;
+
 		return;
 	}
 

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());

src/Misc/Hooks.BugFixes.cpp

@@ -1560,6 +1560,17 @@ DEFINE_HOOK(0x449462, BuildingClass_IsCellOccupied_UndeploysInto, 0x6)
 	return SkipGameCode;
 }
 
+DEFINE_HOOK(0x73FA92, UnitClass_IsCellOccupied_LandType, 0x8)
+{
+	enum { ContinueCheck = 0x73FC24, NoMove = 0x73FACD };
+
+	GET(UnitClass*, pThis, EBX);
+	GET(CellClass*, pCell, EDI);
+	GET_STACK(bool, containsBridge, STACK_OFFSET(0x90, -0x7D));
+
+	return GroundType::Array[static_cast<int>(containsBridge ? LandType::Road : pCell->LandType)].Cost[static_cast<int>(pThis->Type->SpeedType)] == 0.0f ? NoMove : ContinueCheck;
+}
+
 #pragma region XSurfaceFix
 
 // Fix a crash at 0x7BAEA1 when trying to access a point outside of surface bounds.
@@ -1832,11 +1843,13 @@ DEFINE_HOOK(0x5198C3, FootClass_UpdatePosition_EnterGrinderSound, 0x6)// Infantr
 	return 0;
 }
 
-DEFINE_HOOK(0x51A304, InfantryClass_UpdatePosition_EnterBioReactorSound, 0x6)
+DEFINE_HOOK(0x51A304, InfantryClass_UpdatePosition_EnterBioReactor, 0x6)
 {
 	enum { SkipGameCode = 0x51A30A };
 
 	GET(BuildingClass*, pReactor, EDI);
+	GET(FootClass*, pFoot, ESI);
+	pFoot->Transporter = pReactor;
 	const int enterSound = pReactor->Type->EnterBioReactorSound;
 
 	if (enterSound >= 0)
@@ -1848,11 +1861,13 @@ DEFINE_HOOK(0x51A304, InfantryClass_UpdatePosition_EnterBioReactorSound, 0x6)
 	return 0;
 }
 
-DEFINE_HOOK(0x44DBCF, BuildingClass_Mission_Unload_LeaveBioReactorSound, 0x6)
+DEFINE_HOOK(0x44DBCF, BuildingClass_Mission_Unload_LeaveBioReactor, 0x6)
 {
 	enum { SkipGameCode = 0x44DBD5 };
 
 	GET(BuildingClass*, pReactor, EBP);
+	GET(FootClass*, pFoot, ESI);
+	pFoot->Transporter = nullptr;
 	const int leaveSound = pReactor->Type->LeaveBioReactorSound;
 
 	if (leaveSound >= 0)