From 7ead76e8d2510406f564a826faab0cd5aa2aee45 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Thu, 25 Mar 2021 01:15:12 +0000 Subject: [PATCH] Remove SFileDdaSetVolume It is only used in one place and does not actually control the volume of any specific file. --- 3rdParty/Storm/Source/storm.h | 2 -- SourceX/sound.cpp | 2 +- SourceX/storm/storm.cpp | 7 ------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/3rdParty/Storm/Source/storm.h b/3rdParty/Storm/Source/storm.h index f3330c871..291a6f43c 100644 --- a/3rdParty/Storm/Source/storm.h +++ b/3rdParty/Storm/Source/storm.h @@ -207,8 +207,6 @@ BOOL BOOL STORMAPI SFileCloseArchive(HANDLE hArchive); BOOL STORMAPI SFileCloseFile(HANDLE hFile); -BOOL STORMAPI SFileDdaSetVolume(HANDLE hFile, signed int bigvolume, signed int volume); - LONG STORMAPI SFileGetFileSize(HANDLE hFile, LPDWORD lpFileSizeHigh); BOOL STORMAPI SFileOpenArchive(const char *szMpqName, DWORD dwPriority, DWORD dwFlags, HANDLE *phMpq); diff --git a/SourceX/sound.cpp b/SourceX/sound.cpp index 557bbb7e9..bdb74b541 100644 --- a/SourceX/sound.cpp +++ b/SourceX/sound.cpp @@ -237,7 +237,7 @@ int sound_get_or_set_music_volume(int volume) sgOptions.Audio.nMusicVolume = volume; if (sghMusic) - SFileDdaSetVolume(sghMusic, volume, 0); + Mix_VolumeMusic(MIX_MAX_VOLUME - MIX_MAX_VOLUME * volume / VOLUME_MIN); return sgOptions.Audio.nMusicVolume; } diff --git a/SourceX/storm/storm.cpp b/SourceX/storm/storm.cpp index c9176ef1d..fe3a2e668 100644 --- a/SourceX/storm/storm.cpp +++ b/SourceX/storm/storm.cpp @@ -40,13 +40,6 @@ radon::File &getIni() return ini; } -BOOL SFileDdaSetVolume(HANDLE hFile, signed int bigvolume, signed int volume) -{ - Mix_VolumeMusic(MIX_MAX_VOLUME - MIX_MAX_VOLUME * bigvolume / VOLUME_MIN); - - return true; -} - // Converts ASCII characters to lowercase // Converts slash (0x2F) / backslash (0x5C) to system file-separator unsigned char AsciiToLowerTable_Path[256] = {