diff --git a/src/Common/Game/T6/T6_Assets.h b/src/Common/Game/T6/T6_Assets.h index fca7250e..89394044 100644 --- a/src/Common/Game/T6/T6_Assets.h +++ b/src/Common/Game/T6/T6_Assets.h @@ -6228,7 +6228,7 @@ namespace T6 unsigned int distanceLpf : 1; // 2 unsigned int doppler : 1; // 3 unsigned int isBig : 1; // 4 - unsigned int pausable : 1; // 5 + unsigned int pauseable : 1; // 5 unsigned int isMusic : 1; // 6 unsigned int stopOnEntDeath : 1; // 7 unsigned int timescale : 1; // 8 diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp index 3a5d6854..bdece92b 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp @@ -533,7 +533,7 @@ namespace uint8_t dryMinCurve = 0u, dryMaxCurve = 0u, wetMinCurve = 0u, wetMaxCurve = 0u, limitType = 0u, entityLimitType = 0u, randomizeType = 0u, fluxType = 0u, storage = 0u, volumeGroup = 0u, distanceLpf = 0u, doppler = 0u, isBig = 0u, looping = 0u, panType = 0u, isMusic = 0u, timescale = 0u, - pausable = 0u, stopOnEntDeath = 0u, busType = 0u, voiceLimit = 0u, ignoreMaxDist = 0u, neverPlayTwice = 0u, isCinematic = 0u; + pauseable = 0u, stopOnEntDeath = 0u, busType = 0u, voiceLimit = 0u, ignoreMaxDist = 0u, neverPlayTwice = 0u, isCinematic = 0u; // clang-format off const auto couldReadSoundAlias = ReadColumnString(row, headers.m_secondary, alias.secondaryName, memory) @@ -586,7 +586,7 @@ namespace && ReadColumnEnum(headerRow, row, headers.m_is_cinematic, rowIndex, isCinematic, SOUND_NO_YES) && ReadColumnInt16(headerRow, row, headers.m_fade_in, rowIndex, alias.fadeIn, 0) && ReadColumnInt16(headerRow, row, headers.m_fade_out, rowIndex, alias.fadeOut, 0) - && ReadColumnEnum(headerRow, row, headers.m_pauseable, rowIndex, pausable, SOUND_NO_YES) + && ReadColumnEnum(headerRow, row, headers.m_pauseable, rowIndex, pauseable, SOUND_NO_YES) && ReadColumnEnum(headerRow, row, headers.m_stop_on_ent_death, rowIndex, stopOnEntDeath, SOUND_NO_YES) && ReadColumnHash(row, headers.m_stop_on_play, alias.stopOnPlay) && ReadColumnInt16(headerRow, row, headers.m_doppler_scale, rowIndex, alias.dopplerScale, -100, 100) @@ -617,7 +617,7 @@ namespace alias.flags.panType = panType; alias.flags.isMusic = isMusic; alias.flags.timescale = timescale; - alias.flags.pausable = pausable; + alias.flags.pauseable = pauseable; alias.flags.stopOnEntDeath = stopOnEntDeath; alias.flags.busType = busType; alias.flags.voiceLimit = voiceLimit; diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.cpp b/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.cpp index e225d699..67a041f4 100644 --- a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.cpp +++ b/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.cpp @@ -602,8 +602,8 @@ namespace // FadeOut WriteColumnIntegral(stream, alias.fadeOut); - // Pausable - WriteColumnEnum(stream, alias.flags.pausable, SOUND_NO_YES); + // Pauseable + WriteColumnEnum(stream, alias.flags.pauseable, SOUND_NO_YES); // StopOnEntDeath WriteColumnEnum(stream, alias.flags.stopOnEntDeath, SOUND_NO_YES);