Skip to content

Commit 782b3b0

Browse files
committed
update
1 parent 63168dd commit 782b3b0

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/Ext/Rules/Body.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -691,10 +691,11 @@ DEFINE_HOOK(0x6744E4, RulesClass_ReadJumpjetControls_Extra, 0x7)
691691
// After rulesmd.ini has been parsed, before anything else like maps and only once on game init.
692692
DEFINE_HOOK(0x6876B1, ReadScenarioINI_Optimizations, 0x5)
693693
{
694-
auto const pRulesExt = RulesExt::Global();
695-
696-
if (!pRulesExt->BalloonHoverPathingFix)
694+
if (!RulesExt::Global()->BalloonHoverPathingFix)
697695
{
696+
Patch::Apply_RAW(0x64D592, { 0x0F, 0x8F, 0xB8, 0x00, 0x00, 0x00 });
697+
Patch::Apply_RAW(0x64D575, { 0x0F, 0x8F, 0xD5, 0x00, 0x00, 0x00 });
698+
Patch::Apply_RAW(0x64D5C5, { 0x8A, 0x44, 0x24, 0x13, 0x84, 0xC0 });
698699
Patch::Apply_RAW(0x51BFA2, { 0x85, 0x99, 0x40, 0x01, 0x00, 0x00 });
699700
Patch::Apply_RAW(0x73F0A7, { 0x8B, 0xD9, 0x8B, 0x8C, 0x24, 0x88, 0x00, 0x00, 0x00 });
700701
Patch::Apply_RAW(0x4D5690, { 0x55, 0x8B, 0xEC, 0x83, 0xE4, 0xF8 });

src/Misc/Hooks.BugFixes.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2204,35 +2204,35 @@ DEFINE_HOOK(0x64D592, Game_PreProcessMegaMissionList_CheckForTargetCrdRecal1, 0x
22042204
{
22052205
enum { SkipTargetCrdRecal = 0x64D598 };
22062206
GET(TechnoClass*, pTechno, EBP);
2207-
return pTechno->GetTechnoType()->BalloonHover && RulesExt::Global()->BalloonHoverPathingFix ? SkipTargetCrdRecal : 0;
2207+
return pTechno->GetTechnoType()->BalloonHover ? SkipTargetCrdRecal : 0;
22082208
}
22092209

22102210
DEFINE_HOOK(0x64D575, Game_PreProcessMegaMissionList_CheckForTargetCrdRecal2, 0x6)
22112211
{
22122212
enum { SkipTargetCrdRecal = 0x64D598 };
22132213
GET(TechnoClass*, pTechno, EBP);
2214-
return pTechno->GetTechnoType()->BalloonHover && RulesExt::Global()->BalloonHoverPathingFix ? SkipTargetCrdRecal : 0;
2214+
return pTechno->GetTechnoType()->BalloonHover ? SkipTargetCrdRecal : 0;
22152215
}
22162216

22172217
DEFINE_HOOK(0x64D5C5, Game_PreProcessMegaMissionList_CheckForTargetCrdRecal3, 0x6)
22182218
{
22192219
enum { SkipTargetCrdRecal = 0x64D659 };
22202220
GET(TechnoClass*, pTechno, EBP);
2221-
return pTechno->GetTechnoType()->BalloonHover && RulesExt::Global()->BalloonHoverPathingFix ? SkipTargetCrdRecal : 0;
2221+
return pTechno->GetTechnoType()->BalloonHover ? SkipTargetCrdRecal : 0;
22222222
}
22232223

22242224
DEFINE_HOOK(0x51BFA2, InfantryClass_IsCellOccupied_Start, 0x6)
22252225
{
22262226
enum { MoveOK = 0x51C02D };
22272227
GET(InfantryClass*, pThis, EBP);
2228-
return pThis->Type->BalloonHover && RulesExt::Global()->BalloonHoverPathingFix && pThis->IsInAir() ? MoveOK : 0;
2228+
return pThis->Type->BalloonHover && pThis->IsInAir() ? MoveOK : 0;
22292229
}
22302230

22312231
DEFINE_HOOK(0x73F0A7, UnitClass_IsCellOccupied_Start, 0x9)
22322232
{
22332233
enum { MoveOK = 0x73F23F };
22342234
GET(UnitClass*, pThis, ECX);
2235-
return pThis->Type->BalloonHover && RulesExt::Global()->BalloonHoverPathingFix && pThis->IsInAir() ? MoveOK : 0;
2235+
return pThis->Type->BalloonHover && pThis->IsInAir() ? MoveOK : 0;
22362236
}
22372237

22382238
namespace ApproachTargetContext
@@ -2243,7 +2243,7 @@ namespace ApproachTargetContext
22432243
DEFINE_HOOK(0x4D5690, FootClass_ApproachTarget_SetContext, 0x6)
22442244
{
22452245
GET(FootClass*, pThis, ECX);
2246-
ApproachTargetContext::IsBalloonHover = pThis->GetTechnoType()->BalloonHover && RulesExt::Global()->BalloonHoverPathingFix;
2246+
ApproachTargetContext::IsBalloonHover = pThis->GetTechnoType()->BalloonHover;
22472247
return 0;
22482248
}
22492249

0 commit comments

Comments
 (0)