Merge remote-tracking branch 'origin/miami' into lcs

# Conflicts: # src/modelinfo/PedModelInfo.cpp
2021-04-09 04:31:46 +03:00
parent 49b3bf5f2e ceb22d71dd
commit 519218572a
16 changed files with 194 additions and 91 deletions
--- a/src/objects/Stinger.cpp
+++ b/src/objects/Stinger.cpp
@@ -234,5 +234,8 @@ CStinger::Process()
 		Remove();
 		break;
 	}
+#ifdef FIX_BUGS
+	if (bIsDeployed)
+#endif
 	CheckForBurstTyres();
 }