From 2fe3adfe6e87d0d5235138e5b47536fbcccccb56 Mon Sep 17 00:00:00 2001
From: Philip Muzzall <philipmuzzall@gmail.com>
Date: Sun, 24 Sep 2023 16:30:22 -0700
Subject: [PATCH] Fixed warnings about conversions between soundlevel_t and
 float

This replaces the macros ATTN_TO_SNDLVL and SNDLVL_TO_ATTN with inline functions that properly handle conversions between float and soundlevel_t. Eliminates a large number of warnings when compiling with GCC.
---
 sp/src/public/soundflags.h | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/sp/src/public/soundflags.h b/sp/src/public/soundflags.h
index 71ae119299a..9fab2308543 100644
--- a/sp/src/public/soundflags.h
+++ b/sp/src/public/soundflags.h
@@ -102,8 +102,22 @@ enum soundlevel_t
 #define MAX_SNDLVL_VALUE	((1<<MAX_SNDLVL_BITS)-1)
 
 
-#define ATTN_TO_SNDLVL( a ) (soundlevel_t)(int)((a) ? (50 + 20 / ((float)a)) : 0 )
-#define SNDLVL_TO_ATTN( a ) ((a > 50) ? (20.0f / (float)(a - 50)) : 4.0 )
+inline soundlevel_t ATTN_TO_SNDLVL(float a)
+{
+	soundlevel_t sndlvl = soundlevel_t::SNDLVL_NONE;
+
+	if (a >= 0.0f)
+	{
+		sndlvl = soundlevel_t(float(soundlevel_t::SNDLVL_50dB) + float(soundlevel_t::SNDLVL_20dB) / a);
+	}
+
+	return sndlvl;
+}
+
+inline float SNDLVL_TO_ATTN(soundlevel_t s)
+{
+	return (s > soundlevel_t::SNDLVL_50dB)? (20.0f / float(s - soundlevel_t::SNDLVL_50dB)) : 4.0f;
+}
 
 // This is a limit due to network encoding.
 // It encodes attenuation * 64 in 8 bits, so the maximum is (255 / 64)