From 4f04af6123d9c646279b5b80498f07778f863be8 Mon Sep 17 00:00:00 2001 From: infernalxdrm <36190565+infernalxdrm@users.noreply.github.com> Date: Fri, 5 Nov 2021 04:14:31 +0700 Subject: [PATCH] Get rid of warnings (#88) * Get rid of warnings -macro expansion producing 'defined' has undefined behaviour -conversion from 'int' to 'float', possible loss of data * Get rid of errors -conversion from 'int' to 'float', possible loss of data --- public/mathlib/vector.h | 19 ++++++++++--------- public/mathlib/vector2d.h | 6 +++--- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/public/mathlib/vector.h b/public/mathlib/vector.h index 6b332b56..edef6df5 100644 --- a/public/mathlib/vector.h +++ b/public/mathlib/vector.h @@ -1,4 +1,4 @@ -//====== Copyright © 1996-2005, Valve Corporation, All rights reserved. =======// +//====== Copyright © 1996-2005, Valve Corporation, All rights reserved. =======// // // Purpose: // @@ -203,8 +203,9 @@ private: }; - -#define USE_M64S ( ( !defined( _X360 ) ) && ( ! defined( _LINUX) ) ) +#if ( ( !defined( _X360 ) ) && ( ! defined( _LINUX) ) ) + #define USE_M64S 1 +#endif @@ -516,9 +517,9 @@ inline void Vector::Init( vec_t ix, vec_t iy, vec_t iz ) inline void Vector::Random( vec_t minVal, vec_t maxVal ) { - x = minVal + ((float)rand() / RAND_MAX) * (maxVal - minVal); - y = minVal + ((float)rand() / RAND_MAX) * (maxVal - minVal); - z = minVal + ((float)rand() / RAND_MAX) * (maxVal - minVal); + x = minVal + ((float)rand() / (float)RAND_MAX) * (maxVal - minVal); + y = minVal + ((float)rand() / (float)RAND_MAX) * (maxVal - minVal); + z = minVal + ((float)rand() / (float)RAND_MAX) * (maxVal - minVal); CHECK_VALID(*this); } @@ -1852,9 +1853,9 @@ inline void QAngle::Init( vec_t ix, vec_t iy, vec_t iz ) inline void QAngle::Random( vec_t minVal, vec_t maxVal ) { - x = minVal + ((float)rand() / RAND_MAX) * (maxVal - minVal); - y = minVal + ((float)rand() / RAND_MAX) * (maxVal - minVal); - z = minVal + ((float)rand() / RAND_MAX) * (maxVal - minVal); + x = minVal + ((float)rand() / (float)RAND_MAX) * (maxVal - minVal); + y = minVal + ((float)rand() / (float)RAND_MAX) * (maxVal - minVal); + z = minVal + ((float)rand() / (float)RAND_MAX) * (maxVal - minVal); CHECK_VALID(*this); } diff --git a/public/mathlib/vector2d.h b/public/mathlib/vector2d.h index 35ed31e6..30a3a038 100644 --- a/public/mathlib/vector2d.h +++ b/public/mathlib/vector2d.h @@ -1,4 +1,4 @@ -//========= Copyright © 1996-2005, Valve Corporation, All rights reserved. ============// +//========= Copyright © 1996-2005, Valve Corporation, All rights reserved. ============// // // Purpose: // @@ -239,8 +239,8 @@ inline void Vector2D::Init( vec_t ix, vec_t iy ) inline void Vector2D::Random( float minVal, float maxVal ) { - x = minVal + ((float)rand() / RAND_MAX) * (maxVal - minVal); - y = minVal + ((float)rand() / RAND_MAX) * (maxVal - minVal); + x = minVal + ((float)rand() / (float)RAND_MAX) * (maxVal - minVal); + y = minVal + ((float)rand() / (float)RAND_MAX) * (maxVal - minVal); } inline void Vector2DClear( Vector2D& a )