summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-12-26 12:56:34 +0300
committerNikolay Korolev <nickvnuk@gmail.com>2020-12-26 12:56:34 +0300
commitf6fe5c96c9f85d1916da9d19e6bf0de66885b3c6 (patch)
treefafb584aa306c6ffa619918c7a3733eb4e73694b
parent149aef929dfb21642a5d7b698b9802bd7a45359c (diff)
parent3b2558bb9e2abea80ed7f06cd2a893549eda5119 (diff)
Merge remote-tracking branch 'upstream/miami' into miami
-rw-r--r--src/vehicles/Bike.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/vehicles/Bike.cpp b/src/vehicles/Bike.cpp
index 06cca57e..2148a1a4 100644
--- a/src/vehicles/Bike.cpp
+++ b/src/vehicles/Bike.cpp
@@ -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)
{