MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-03-04 09:45:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mapbase-source:develop' into develop

Browse Source
This commit is contained in:
Bronzehawk75 2024-06-22 14:36:47 -04:00 committed by GitHub
commit 4e7f6338e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sp/src/public/soundflags.h
View File

@ -102,6 +102,10 @@ enum soundlevel_t
#define MAX_SNDLVL_VALUE ((1<<MAX_SNDLVL_BITS)-1) #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) inline soundlevel_t ATTN_TO_SNDLVL(float a)
{ {
soundlevel_t sndlvl = soundlevel_t::SNDLVL_NONE; 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; 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. // This is a limit due to network encoding.
// It encodes attenuation * 64 in 8 bits, so the maximum is (255 / 64) // It encodes attenuation * 64 in 8 bits, so the maximum is (255 / 64)

4
sp/src/public/tier0/platform.h
View File

@ -1281,8 +1281,8 @@ PLATFORM_INTERFACE bool Is64BitOS();
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// General Mapbase version constants compiled into projects for versioning purposes // General Mapbase version constants compiled into projects for versioning purposes
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#define MAPBASE_VERSION "7.1" #define MAPBASE_VERSION "7.2"
#define MAPBASE_VER_INT 7100 // For use in #if in a similar fashion to macros like _MSC_VER #define MAPBASE_VER_INT 7200 // For use in #if in a similar fashion to macros like _MSC_VER
#endif #endif