Skip to content

Commit

Permalink
loosen previous fix
Browse files Browse the repository at this point in the history
  • Loading branch information
chaserli committed Dec 28, 2023
1 parent aa899e2 commit 7af4da6
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 14 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ docs/locale/.doctrees/
build
cmake-*
out
.idea
1 change: 1 addition & 0 deletions CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ This page lists all the individual contributions to the project by their author.
- Remove sound events when mind-controlled vehicles deploy into buildings or when buildings considered as vehicles get captured
- Building LightSource tint S/L fix
- Permanent healthbar display on units targeted by temporal weapons fix
- Powered anims on buildings cease playing upon capture by different house fix
- TechnoType conversion placeholder
- Misc code refactor & maintenance, CN doc fixes, bugfixes
- **FlyStar**
Expand Down
1 change: 1 addition & 0 deletions src/Ext/TechnoType/Hooks.Teleport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#define GET_LOCO(reg_Loco) \
GET(ILocomotion *, Loco, reg_Loco); \
__assume(Loco!=nullptr);\
TeleportLocomotionClass *pLocomotor = static_cast<TeleportLocomotionClass*>(Loco); \
TechnoTypeClass *pType = pLocomotor->LinkedTo->GetTechnoType(); \
TechnoTypeExt::ExtData *pExt = TechnoTypeExt::ExtMap.Find(pType);
Expand Down
16 changes: 2 additions & 14 deletions src/Misc/Hooks.BugFixes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -794,17 +794,5 @@ bool __fastcall BuildingClass_SetOwningHouse_Wrapper(BuildingClass* pThis, void*
}

DEFINE_JUMP(VTABLE, 0x7E4290, GET_OFFSET(BuildingClass_SetOwningHouse_Wrapper));

DEFINE_HOOK(0x6E0BB4, TActionClass_36_Rewrite, 0x6)
{
GET(HouseClass*, pDecided, EBP);
GET_STACK(HouseClass*, pHouse, STACK_OFFSET(0x10, 0x4));
bool res = false;
for (auto* pTechno : *TechnoClass::Array)
{
if (pTechno->Owner == pHouse)
res = res || pTechno->SetOwningHouse(pDecided, false);
}
R->BL(res);
return 0x6E0C8B;
}
DEFINE_JUMP(LJMP, 0x6E0BD4, 0x6E0BFE);
DEFINE_JUMP(LJMP, 0x6E0C1D, 0x6E0C8B);//Simplify TAction 36

0 comments on commit 7af4da6

Please sign in to comment.