Fix compilation with Visual Studio 17.10

Hrusteckiy · Jun 29, 2024 · b5496f1 · b5496f1
1 parent 14c4692
commit b5496f1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/xrGame/CustomRocket.cpp b/src/xrGame/CustomRocket.cpp
@@ -180,6 +180,12 @@ void CCustomRocket::create_physic_shell()
 // Rocket specific functions
 //////////////////////////////////////////////////////////////////////////
 
+#pragma warning(push)
+
+// XXX: maybe update ODE to a newer version
+// The warning happens on line 241: l_pMYU->last_pos[0] != -dInfinity
+#pragma warning(disable : 4756)
+
 void CCustomRocket::ObjectContactCallback(
     bool& do_colide, bool bo1, dContact& c, SGameMtl* material_1, SGameMtl* material_2)
 {
@@ -291,6 +297,7 @@ void CCustomRocket::ObjectContactCallback(
     {
     }
 }
+#pragma warning(pop)
 
 void CCustomRocket::Load(LPCSTR section)
 {

diff --git a/src/xrPhysics/tri-colliderknoopc/dcTriangle.h b/src/xrPhysics/tri-colliderknoopc/dcTriangle.h
@@ -1,4 +1,9 @@
 #pragma once
+
+// XXX: maybe update ODE to a newer version
+// The warning happens on lines 23-24 when assigning to -dInfinity
+#pragma warning(disable : 4756)
+
 struct Triangle
 {
     // dReal* v0;
@@ -20,3 +25,5 @@ struct Triangle
 #endif
     }
 };
+
+#pragma warning(pop)