Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Nikolay Korolev 2020-02-02 15:22:35 +03:00
commit 911f3360de

View File

@ -4328,7 +4328,7 @@ CAutomobile::RemoveBonnetInPedCollision(void)
{ {
CObject *obj; CObject *obj;
if(Damage.GetDoorStatus(DOOR_BONNET) != DOOR_STATUS_SWINGING && if(Damage.GetDoorStatus(DOOR_BONNET) == DOOR_STATUS_SWINGING &&
Doors[DOOR_BONNET].RetAngleWhenOpen()*0.4f < Doors[DOOR_BONNET].m_fAngle){ Doors[DOOR_BONNET].RetAngleWhenOpen()*0.4f < Doors[DOOR_BONNET].m_fAngle){
// BUG? why not COMPGROUP_BONNET? // BUG? why not COMPGROUP_BONNET?
obj = SpawnFlyingComponent(CAR_BONNET, COMPGROUP_DOOR); obj = SpawnFlyingComponent(CAR_BONNET, COMPGROUP_DOOR);