From 2a3b25af9aaeb9c0937e418a8d955a519dfe5dc6 Mon Sep 17 00:00:00 2001 From: ZehMatt Date: Fri, 30 Jul 2021 02:52:41 +0300 Subject: [PATCH] Mark values constexpr in FileAudioSource --- src/openrct2-ui/audio/FileAudioSource.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/openrct2-ui/audio/FileAudioSource.cpp b/src/openrct2-ui/audio/FileAudioSource.cpp index 60f4087b25..b26257fc64 100644 --- a/src/openrct2-ui/audio/FileAudioSource.cpp +++ b/src/openrct2-ui/audio/FileAudioSource.cpp @@ -68,11 +68,11 @@ namespace OpenRCT2::Audio bool LoadWAV(SDL_RWops* rw) { - const uint32_t DATA = 0x61746164; - const uint32_t FMT = 0x20746D66; - const uint32_t RIFF = 0x46464952; - const uint32_t WAVE = 0x45564157; - const uint16_t pcmformat = 0x0001; + constexpr uint32_t DATA = 0x61746164; + constexpr uint32_t FMT = 0x20746D66; + constexpr uint32_t RIFF = 0x46464952; + constexpr uint32_t WAVE = 0x45564157; + constexpr uint16_t pcmformat = 0x0001; Unload(); @@ -152,10 +152,10 @@ namespace OpenRCT2::Audio { return subchunkSize; } - const uint32_t FACT = 0x74636166; - const uint32_t LIST = 0x5453494c; - const uint32_t BEXT = 0x74786562; - const uint32_t JUNK = 0x4B4E554A; + constexpr uint32_t FACT = 0x74636166; + constexpr uint32_t LIST = 0x5453494c; + constexpr uint32_t BEXT = 0x74786562; + constexpr uint32_t JUNK = 0x4B4E554A; while (subchunkId == FACT || subchunkId == LIST || subchunkId == BEXT || subchunkId == JUNK) { SDL_RWseek(rw, subchunkSize, RW_SEEK_CUR);