Skip to content

Commit 89b4c5b

Browse files
committed
Fix carryalls not working
1 parent 6796bd9 commit 89b4c5b

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/extensions/aircraft/aircraftext_hooks.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -460,13 +460,16 @@ DECLARE_PATCH(_AircraftClass_Init_IsCloakable_BugFix_Patch)
460460
}
461461

462462

463-
bool Is_Missile_Spawn(AircraftClass* airc) { return Extension::Fetch<AircraftTypeClassExtension>(airc->Class)->IsMissileSpawn; }
464463
DECLARE_PATCH(_AircraftClass_Enter_Idle_Mode_Spawner_Patch)
465464
{
466465
GET_REGISTER_STATIC(AircraftClass*, this_ptr, esi);
467-
GET_REGISTER_STATIC(int, landing_altitude, eax);
466+
GET_REGISTER_STATIC(int, layer, eax);
467+
GET_REGISTER_STATIC(int, landingaltitude, ebp);
468+
static AircraftTypeClassExtension* aircrafttypeext;
468469

469-
if (this_ptr->In_Which_Layer() != LAYER_GROUND && this_ptr->Get_Height() > landing_altitude && !Is_Missile_Spawn(this_ptr))
470+
aircrafttypeext = Extension::Fetch<AircraftTypeClassExtension>(this_ptr->Class);
471+
472+
if (layer != LAYER_GROUND && this_ptr->Get_Height() > landingaltitude && !aircrafttypeext->IsMissileSpawn)
470473
{
471474
JMP(0x0040B3C1);
472475
}

0 commit comments

Comments
 (0)