Merge from dev [skip ci]

Author: xrSimpodin

.github/README.md

@@ -25,7 +25,7 @@
 #### For the engine to work with the worldwide version of SoC, use the ` -steam` launch parameter ####
 
 ### Compilation guide: ###
-* Visual Studio 15.5 or later required.
+* Latest version of Visual Studio 2017 or 2019 or 2022 required
 * Open Engine.sln
 * Set the platform to x64 and the configuration to Release, then select Build -> Build solution
 ### Thanks to: ###
@@ -59,7 +59,7 @@ And everyone else whose work has been used. If you are not mentioned, send a mes
 #### Для того, чтобы движок работал с WW-версией SHOC - используйте специальный ключ запуска ` -steam` ####
 
 ### Инструкции по сборке: ###
-* Для сборки требуется Visual Studio 15.5 или выше.
+* Требуется актуальная версия Visual Studio 2017 или 2019 или 2022
 * Открываете Engine.sln
 * В студии выбираете Сборка -> Собрать решение, предварительно выставив платформу x64 и конфигурацию Release
 ### Благодарим: ###

3rd_party/Src/d3dx/d3dx/d3dx9math.h

@@ -56,7 +56,7 @@ typedef struct D3DXFLOAT16
 {
 #ifdef __cplusplus
 public:
-    D3DXFLOAT16() {};
+    D3DXFLOAT16() = default;
     D3DXFLOAT16( FLOAT );
     D3DXFLOAT16( CONST D3DXFLOAT16& );
 
@@ -88,7 +88,7 @@ typedef struct D3DXVECTOR2
 {
 #ifdef __cplusplus
 public:
-    D3DXVECTOR2() {};
+    D3DXVECTOR2() = default;
     D3DXVECTOR2( CONST FLOAT * );
     D3DXVECTOR2( CONST D3DXFLOAT16 * );
     D3DXVECTOR2( FLOAT x, FLOAT y );
@@ -162,7 +162,7 @@ typedef struct D3DXVECTOR2_16F
 typedef struct D3DXVECTOR3 : public D3DVECTOR
 {
 public:
-    D3DXVECTOR3() {};
+    D3DXVECTOR3() = default;
     D3DXVECTOR3( CONST FLOAT * );
     D3DXVECTOR3( CONST D3DVECTOR& );
     D3DXVECTOR3( CONST D3DXFLOAT16 * );
@@ -237,7 +237,7 @@ typedef struct D3DXVECTOR4
 {
 #ifdef __cplusplus
 public:
-    D3DXVECTOR4() {};
+    D3DXVECTOR4() = default;
     D3DXVECTOR4( CONST FLOAT* );
     D3DXVECTOR4( CONST D3DXFLOAT16* );
     D3DXVECTOR4( CONST D3DVECTOR& xyz, FLOAT w );
@@ -426,7 +426,7 @@ typedef struct D3DXQUATERNION
 {
 #ifdef __cplusplus
 public:
-    D3DXQUATERNION() {}
+    D3DXQUATERNION() = default;
     D3DXQUATERNION( CONST FLOAT * );
     D3DXQUATERNION( CONST D3DXFLOAT16 * );
     D3DXQUATERNION( FLOAT x, FLOAT y, FLOAT z, FLOAT w );
@@ -472,7 +472,7 @@ typedef struct D3DXPLANE
 {
 #ifdef __cplusplus
 public:
-    D3DXPLANE() {}
+    D3DXPLANE() = default;
     D3DXPLANE( CONST FLOAT* );
     D3DXPLANE( CONST D3DXFLOAT16* );
     D3DXPLANE( FLOAT a, FLOAT b, FLOAT c, FLOAT d );
@@ -513,7 +513,7 @@ typedef struct D3DXCOLOR
 {
 #ifdef __cplusplus
 public:
-    D3DXCOLOR() {}
+    D3DXCOLOR() = default;
     D3DXCOLOR( DWORD argb );
     D3DXCOLOR( CONST FLOAT * );
     D3DXCOLOR( CONST D3DXFLOAT16 * );

3rd_party/Src/ode/include/ode/misc.h

@@ -55,7 +55,7 @@ dReal dRandReal();
 
 /* print out a matrix */
 #ifdef __cplusplus
-void dPrintMatrix (const dReal *A, int n, int m, char *fmt = "%10.4f ",
+void dPrintMatrix (const dReal *A, int n, int m, const char *fmt = "%10.4f ",
 		   FILE *f=stdout);
 #else
 void dPrintMatrix (const dReal *A, int n, int m, char *fmt, FILE *f);

3rd_party/Src/ode/include/ode/odecpp.h

@@ -323,7 +323,7 @@ class dBallJoint : public dJoint {
   void operator= (const dBallJoint &);
 
 public:
-  dBallJoint() { }
+  dBallJoint() = default;
   dBallJoint (dWorldID world, dJointGroupID group=0)
     { _id = dJointCreateBall (world, group); }
 
@@ -347,7 +347,7 @@ class dHingeJoint : public dJoint {
   void operator = (const dHingeJoint &);
 
 public:
-  dHingeJoint() { }
+  dHingeJoint() = default;
   dHingeJoint (dWorldID world, dJointGroupID group=0)
     { _id = dJointCreateHinge (world, group); }
 
@@ -389,7 +389,7 @@ class dSliderJoint : public dJoint {
   void operator = (const dSliderJoint &);
 
 public:
-  dSliderJoint() { }
+  dSliderJoint() = default;
   dSliderJoint (dWorldID world, dJointGroupID group=0)
     { _id = dJointCreateSlider (world, group); }
 
@@ -424,7 +424,7 @@ class dUniversalJoint : public dJoint {
   void operator = (const dUniversalJoint &);
 
 public:
-  dUniversalJoint() { }
+  dUniversalJoint() = default;
   dUniversalJoint (dWorldID world, dJointGroupID group=0)
     { _id = dJointCreateUniversal (world, group); }
 
@@ -472,7 +472,7 @@ class dHinge2Joint : public dJoint {
   void operator = (const dHinge2Joint &);
 
 public:
-  dHinge2Joint() { }
+  dHinge2Joint() = default;
   dHinge2Joint (dWorldID world, dJointGroupID group=0)
     { _id = dJointCreateHinge2 (world, group); }
 
@@ -520,7 +520,7 @@ class dFixedJoint : public dJoint {
   void operator = (const dFixedJoint &);
 
 public:
-  dFixedJoint() { }
+  dFixedJoint() = default;
   dFixedJoint (dWorldID world, dJointGroupID group=0)
     { _id = dJointCreateFixed (world, group); }
 
@@ -540,7 +540,7 @@ class dContactJoint : public dJoint {
   void operator = (const dContactJoint &);
 
 public:
-  dContactJoint() { }
+  dContactJoint() = default;
   dContactJoint (dWorldID world, dJointGroupID group, dContact *contact)
     { _id = dJointCreateContact (world, group, contact); }
 
@@ -557,7 +557,7 @@ class dNullJoint : public dJoint {
   void operator = (const dNullJoint &);
 
 public:
-  dNullJoint() { }
+  dNullJoint() = default;
   dNullJoint (dWorldID world, dJointGroupID group=0)
     { _id = dJointCreateNull (world, group); }
 
@@ -574,7 +574,7 @@ class dAMotorJoint : public dJoint {
   void operator = (const dAMotorJoint &);
 
 public:
-  dAMotorJoint() { }
+  dAMotorJoint() = default;
   dAMotorJoint (dWorldID world, dJointGroupID group=0)
     { _id = dJointCreateAMotor (world, group); }
 

3rd_party/Src/ode/include/ode/odecpp_collision.h

@@ -192,7 +192,7 @@ class dSphere : public dGeom {
   void operator= (dSphere &);
 
 public:
-  dSphere () { }
+  dSphere () = default;
   dSphere (dSpaceID space, dReal radius)
     { _id = dCreateSphere (space, radius); }
 
@@ -214,7 +214,7 @@ class dBox : public dGeom {
   void operator= (dBox &);
 
 public:
-  dBox () { }
+  dBox () = default;
   dBox (dSpaceID space, dReal lx, dReal ly, dReal lz)
     { _id = dCreateBox (space,lx,ly,lz); }
 
@@ -236,7 +236,7 @@ class dPlane : public dGeom {
   void operator= (dPlane &);
 
 public:
-  dPlane() { }
+  dPlane() = default;
   dPlane (dSpaceID space, dReal a, dReal b, dReal c, dReal d)
     { _id = dCreatePlane (space,a,b,c,d); }
 
@@ -258,7 +258,7 @@ class dCCylinder : public dGeom {
   void operator= (dCCylinder &);
 
 public:
-  dCCylinder() { }
+  dCCylinder() = default;
   dCCylinder (dSpaceID space, dReal radius, dReal length)
     { _id = dCreateCCylinder (space,radius,length); }
 
@@ -280,7 +280,7 @@ class dRay : public dGeom {
   void operator= (dRay &);
 
 public:
-  dRay() { }
+  dRay() = default;
   dRay (dSpaceID space, dReal length)
     { _id = dCreateRay (space,length); }
 
@@ -316,7 +316,7 @@ class dGeomTransform : public dGeom {
   void operator= (dGeomTransform &);
 
 public:
-  dGeomTransform() { }
+  dGeomTransform() = default;
   dGeomTransform (dSpaceID space)
     { _id = dCreateGeomTransform (space); }
 

3rd_party/Src/ode/ode/src/mat.cpp

@@ -207,7 +207,7 @@ void dMatrix::makeRandom (dReal range)
 }
 
 
-void dMatrix::print (char *fmt, FILE *f)
+void dMatrix::print (const char *fmt, FILE *f)
 {
   for (int i=0; i<n; i++) {
     for (int j=0; j<m; j++) fprintf (f,fmt,data[i*m+j]);

3rd_party/Src/ode/ode/src/mat.h

@@ -63,7 +63,7 @@ class dMatrix {
   void clearUpperTriangle();
   void clearLowerTriangle();
   void makeRandom (dReal range);
-  void print (char *fmt = "%10.4f ", FILE *f=stdout);
+  void print (const char *fmt = "%10.4f ", FILE *f=stdout);
   dReal maxDifference (const dMatrix &);
 };
 

3rd_party/Src/ode/ode/src/misc.cpp

@@ -76,7 +76,7 @@ dReal dRandReal()
 //****************************************************************************
 // matrix utility stuff
 
-void dPrintMatrix (const dReal *A, int n, int m, char *fmt, FILE *f)
+void dPrintMatrix (const dReal *A, int n, int m, const char *fmt, FILE *f)
 {
   int i,j;
   int skip = dPAD(m);

3rd_party/Src/ode/ode/src/timer.cpp

@@ -262,7 +262,7 @@ static struct {
   double total_t;		// total clocks used in this slot.
   double total_p;		// total percentage points used in this slot.
   int count;			// number of times this slot has been updated.
-  char *description;		// pointer to static string
+  const char* description; // pointer to static string
 } event[MAXNUM];
 
 
@@ -285,7 +285,7 @@ static void initSlots()
 void dTimerStart (const char *description)
 {
   initSlots();
-  event[0].description = const_cast<char*> (description);
+  event[0].description = description;
   num = 1;
   serialize();
   getClockCount (event[0].cc);
@@ -297,7 +297,7 @@ void dTimerNow (const char *description)
   if (num < MAXNUM) {
     // do not serialize
     getClockCount (event[num].cc);
-    event[num].description = const_cast<char*> (description);
+    event[num].description = description;
     num++;
   }
 }