From 10c17fefe7fccdfc0e64b39299e8716664967296 Mon Sep 17 00:00:00 2001 From: fallenoak Date: Sat, 29 Nov 2025 11:50:00 -0600 Subject: [PATCH] feat(sound): use better name for static --- src/sound/SI2.cpp | 8 ++++---- src/sound/SI2.hpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sound/SI2.cpp b/src/sound/SI2.cpp index 79dbd87..266c775 100644 --- a/src/sound/SI2.cpp +++ b/src/sound/SI2.cpp @@ -13,7 +13,7 @@ TSGrowableArray SI2::s_SoundKitDefs; TSHashTable SI2::s_SoundKitLookupTable; -char SI2::s_SoundCategory[32][18] = { +char SI2::s_ChannelGroupNames[32][18] = { "SFX", "MUSIC", "AMBIENCE", @@ -322,7 +322,7 @@ int32_t SI2::PlaySoundKit(int32_t id, int32_t a2, SOUNDKITOBJECT* object, SoundK // TODO - if (!std::strcmp(SI2::s_SoundCategory[properties->m_type], "SFX")) { + if (!std::strcmp(SI2::s_ChannelGroupNames[properties->m_type], "SFX")) { static auto enableSFXVar = CVar::Lookup("Sound_EnableSFX"); if (!enableSFXVar || !enableSFXVar->GetInt()) { @@ -331,8 +331,8 @@ int32_t SI2::PlaySoundKit(int32_t id, int32_t a2, SOUNDKITOBJECT* object, SoundK } if ( - !std::strcmp(SI2::s_SoundCategory[properties->m_type], "MUSIC") - || !strcmp(SI2::s_SoundCategory[properties->m_type], "SCRIPTMUSIC") + !std::strcmp(SI2::s_ChannelGroupNames[properties->m_type], "MUSIC") + || !strcmp(SI2::s_ChannelGroupNames[properties->m_type], "SCRIPTMUSIC") ) { static auto enableMusicVar = CVar::Lookup("Sound_EnableMusic"); diff --git a/src/sound/SI2.hpp b/src/sound/SI2.hpp index c2c303f..489ad19 100644 --- a/src/sound/SI2.hpp +++ b/src/sound/SI2.hpp @@ -18,7 +18,7 @@ class SI2 { static FrameScript_Method s_ScriptFunctions[NUM_SCRIPT_FUNCTIONS_SI2]; static TSGrowableArray s_SoundKitDefs; static TSHashTable s_SoundKitLookupTable; - static char s_SoundCategory[32][18]; + static char s_ChannelGroupNames[32][18]; // Static functions static int32_t CreditsMusicUpdate(const void* data, void* param);