zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 08:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename all instances of Pausable to Pauseable

Browse Source
This commit is contained in:
Jbleezy 2024-10-06 15:16:14 -07:00
parent a926b752cf
commit 4529ff2c5e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Common/Game/T6/T6_Assets.h
View File

@ -6228,7 +6228,7 @@ namespace T6
unsigned int distanceLpf : 1; // 2 unsigned int distanceLpf : 1; // 2
unsigned int doppler : 1; // 3 unsigned int doppler : 1; // 3
unsigned int isBig : 1; // 4 unsigned int isBig : 1; // 4
unsigned int pausable : 1; // 5 unsigned int pauseable : 1; // 5
unsigned int isMusic : 1; // 6 unsigned int isMusic : 1; // 6
unsigned int stopOnEntDeath : 1; // 7 unsigned int stopOnEntDeath : 1; // 7
unsigned int timescale : 1; // 8 unsigned int timescale : 1; // 8

6
src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderSoundBank.cpp
View File

@ -533,7 +533,7 @@ namespace
uint8_t dryMinCurve = 0u, dryMaxCurve = 0u, wetMinCurve = 0u, wetMaxCurve = 0u, limitType = 0u, entityLimitType = 0u, randomizeType = 0u, fluxType = 0u, 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, 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 // clang-format off
const auto couldReadSoundAlias = const auto couldReadSoundAlias =
ReadColumnString(row, headers.m_secondary, alias.secondaryName, memory) 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) && 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_in, rowIndex, alias.fadeIn, 0)
&& ReadColumnInt16(headerRow, row, headers.m_fade_out, rowIndex, alias.fadeOut, 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) && ReadColumnEnum(headerRow, row, headers.m_stop_on_ent_death, rowIndex, stopOnEntDeath, SOUND_NO_YES)
&& ReadColumnHash(row, headers.m_stop_on_play, alias.stopOnPlay) && ReadColumnHash(row, headers.m_stop_on_play, alias.stopOnPlay)
&& ReadColumnInt16(headerRow, row, headers.m_doppler_scale, rowIndex, alias.dopplerScale, -100, 100) && ReadColumnInt16(headerRow, row, headers.m_doppler_scale, rowIndex, alias.dopplerScale, -100, 100)
@ -617,7 +617,7 @@ namespace
alias.flags.panType = panType; alias.flags.panType = panType;
alias.flags.isMusic = isMusic; alias.flags.isMusic = isMusic;
alias.flags.timescale = timescale; alias.flags.timescale = timescale;
alias.flags.pausable = pausable; alias.flags.pauseable = pauseable;
alias.flags.stopOnEntDeath = stopOnEntDeath; alias.flags.stopOnEntDeath = stopOnEntDeath;
alias.flags.busType = busType; alias.flags.busType = busType;
alias.flags.voiceLimit = voiceLimit; alias.flags.voiceLimit = voiceLimit;

4
src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.cpp
View File

@ -602,8 +602,8 @@ namespace
// FadeOut // FadeOut
WriteColumnIntegral(stream, alias.fadeOut); WriteColumnIntegral(stream, alias.fadeOut);
// Pausable // Pauseable
WriteColumnEnum(stream, alias.flags.pausable, SOUND_NO_YES); WriteColumnEnum(stream, alias.flags.pauseable, SOUND_NO_YES);
// StopOnEntDeath // StopOnEntDeath
WriteColumnEnum(stream, alias.flags.stopOnEntDeath, SOUND_NO_YES); WriteColumnEnum(stream, alias.flags.stopOnEntDeath, SOUND_NO_YES);