Fix soundlevel_t compile error on VS2013

Blixibon · Blixibon · commit 471a840ed98c · 2024-03-09T02:13:59.000-06:00
diff --git a/sp/src/public/soundflags.h b/sp/src/public/soundflags.h
@@ -102,6 +102,10 @@ enum soundlevel_t
 #define MAX_SNDLVL_VALUE	((1<<MAX_SNDLVL_BITS)-1)
 
 
+#if !defined(LINUX)
+#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 )
+#else
 inline soundlevel_t ATTN_TO_SNDLVL(float a)
 {
 	soundlevel_t sndlvl = soundlevel_t::SNDLVL_NONE;
@@ -118,6 +122,7 @@ inline float SNDLVL_TO_ATTN(soundlevel_t s)
 {
 	return (s > soundlevel_t::SNDLVL_50dB)? (20.0f / float(s - soundlevel_t::SNDLVL_50dB)) : 4.0f;
 }
+#endif
 
 // This is a limit due to network encoding.
 // It encodes attenuation * 64 in 8 bits, so the maximum is (255 / 64)

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,10 @@ enum soundlevel_t`
`102`	`102`	`#define MAX_SNDLVL_VALUE ((1<<MAX_SNDLVL_BITS)-1)`
`103`	`103`
`104`	`104`
	`105`	`+#if !defined(LINUX)`
	`106`	`+#define ATTN_TO_SNDLVL( a ) (soundlevel_t)(int)((a) ? (50 + 20 / ((float)a)) : 0 )`
	`107`	`+#define SNDLVL_TO_ATTN( a ) ((a > 50) ? (20.0f / (float)(a - 50)) : 4.0 )`
	`108`	`+#else`
`105`	`109`	`inline soundlevel_t ATTN_TO_SNDLVL(float a)`
`106`	`110`	`{`
`107`	`111`	`soundlevel_t sndlvl = soundlevel_t::SNDLVL_NONE;`
`@@ -118,6 +122,7 @@ inline float SNDLVL_TO_ATTN(soundlevel_t s)`
`118`	`122`	`{`
`119`	`123`	`return (s > soundlevel_t::SNDLVL_50dB)? (20.0f / float(s - soundlevel_t::SNDLVL_50dB)) : 4.0f;`
`120`	`124`	`}`
	`125`	`+#endif`
`121`	`126`
`122`	`127`	`// This is a limit due to network encoding.`
`123`	`128`	`// It encodes attenuation * 64 in 8 bits, so the maximum is (255 / 64)`