Merge remote-tracking branch 'upstream/miami' into miami

This commit is contained in:
Nikolay Korolev 2020-09-11 16:39:35 +03:00
commit f0b15ee053
31 changed files with 1719 additions and 627 deletions

View file

@ -3772,7 +3772,7 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
CPed* pNearPed = ped->m_nearPeds[i];
if (pNearPed->m_leader == ped) {
pNearPed->Teleport(pos);
pNearPed->PositionPedOutOfCollision(); // TODO(MIAMI): this is PositionAnyPedOutOfCollision!!!
pNearPed->PositionAnyPedOutOfCollision();
}
}
}