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

This commit is contained in:
Nikolay Korolev 2020-12-26 12:56:34 +03:00
commit f6fe5c96c9
1 changed files with 4 additions and 0 deletions

View File

@ -205,6 +205,8 @@ float fDAxisY = 1000.0f;
float fInAirXRes = 0.98f;
float fFlySpeedMult = -0.6f;
#pragma optimize("", off) // a workaround for another compiler bug =P, original had optimize off for this function too though
void
CBike::ProcessControl(void)
{
@ -1257,6 +1259,8 @@ CBike::ProcessControl(void)
}
}
#pragma optimize("", on)
void
CBike::Teleport(CVector pos)
{