Fixed a conflict with Heli & Plane Collision fix in III

This commit is contained in:
Silent 2020-04-02 17:31:04 +02:00
parent 65c7702da5
commit 87f9d8b63a
No known key found for this signature in database
GPG key ID: AE53149BB0C45AF1

View file

@ -1229,15 +1229,18 @@ void Patch_III_Common()
// Give chopper/escape a properly sized collision bounding box instead of using ped's // Give chopper/escape a properly sized collision bounding box instead of using ped's
{
auto initHelisPattern = pattern( "C6 40 2C 00 A1" ).count_hint(1);
if ( initHelisPattern.size() == 1 )
{ {
static constexpr CColModel colModelChopper( CColSphere( 8.5f, CVector(0.0f, -1.75f, 0.73f), 0, 0 ), static constexpr CColModel colModelChopper( CColSphere( 8.5f, CVector(0.0f, -1.75f, 0.73f), 0, 0 ),
CColBox( CVector(-2.18f, -8.52f, -0.67f), CVector(-2.18f, 4.58f, 2.125f), 0, 0 ) ); CColBox( CVector(-2.18f, -8.52f, -0.67f), CVector(-2.18f, 4.58f, 2.125f), 0, 0 ) );
auto initHelis = pattern( "C6 40 2C 00 A1" ).get_one(); auto initHelis = initHelisPattern.get_one();
Patch( initHelis.get<void>( -7 + 3 ), &colModelChopper ); Patch( initHelis.get<void>( -7 + 3 ), &colModelChopper );
Patch( initHelis.get<void>( 9 + 3 ), &colModelChopper ); Patch( initHelis.get<void>( 9 + 3 ), &colModelChopper );
} }
}
} }
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)