diff --git a/source/core/raze_sound.cpp b/source/core/raze_sound.cpp index 19a9343ff..405c31738 100644 --- a/source/core/raze_sound.cpp +++ b/source/core/raze_sound.cpp @@ -83,6 +83,18 @@ void FX_SetReverb(int strength) } +//========================================================================== +// +// +// +//========================================================================== + +std::vector RazeSoundEngine::ReadSound(int lumpnum) +{ + auto wlump = fileSystem.OpenFileReader(lumpnum); + return wlump.Read(); +} + //========================================================================== // // S_NoiseDebug diff --git a/source/core/raze_sound.h b/source/core/raze_sound.h index 2b5f24b95..1162ad3e8 100644 --- a/source/core/raze_sound.h +++ b/source/core/raze_sound.h @@ -47,4 +47,5 @@ public: virtual bool SourceIsActor(FSoundChan* chan) { return chan->SourceType == SOURCE_Actor; } virtual int SoundSourceIndex(FSoundChan* chan) { return 0; } virtual void SetSource(FSoundChan* chan, int index) {} + std::vector ReadSound(int lumpnum) override; }; diff --git a/source/core/rts.cpp b/source/core/rts.cpp index 3e8bb3eba..32a6f409d 100644 --- a/source/core/rts.cpp +++ b/source/core/rts.cpp @@ -85,7 +85,7 @@ bool RTS_IsInitialized() auto fr = fileSystem.OpenFileReader(RTSName); RTSName = ""; // don't try ever again. if (!fr.isOpen()) return false; - RTSFile.Resize(fr.GetLength()); + RTSFile.Resize((unsigned)fr.GetLength()); fr.Read(RTSFile.Data(), fr.GetLength()); if (RTSFile.Size() >= 28) // minimum size for one entry { diff --git a/source/games/blood/src/sfx.cpp b/source/games/blood/src/sfx.cpp index 1874d549f..2683d1690 100644 --- a/source/games/blood/src/sfx.cpp +++ b/source/games/blood/src/sfx.cpp @@ -33,7 +33,6 @@ class BloodSoundEngine : public RazeSoundEngine { // client specific parts of the sound engine go in this class. void CalcPosVel(int type, const void* source, const float pt[3], int channum, int chanflags, FSoundID chanSound, FVector3* pos, FVector3* vel, FSoundChan* channel) override; - std::vector ReadSound(int lumpnum) override; public: BloodSoundEngine() @@ -63,12 +62,6 @@ public: // //========================================================================== -std::vector BloodSoundEngine::ReadSound(int lumpnum) -{ - auto wlump = fileSystem.OpenFileReader(lumpnum); - return wlump.Read(); -} - void BloodSoundEngine::CalcPosVel(int type, const void* source, const float pt[3], int channum, int chanflags, FSoundID chanSound, FVector3* pos, FVector3* vel, FSoundChan*) { if (pos != nullptr && type != SOURCE_None) diff --git a/source/games/duke/src/sounds.cpp b/source/games/duke/src/sounds.cpp index c81d90501..5c4123eb2 100644 --- a/source/games/duke/src/sounds.cpp +++ b/source/games/duke/src/sounds.cpp @@ -139,18 +139,6 @@ static FSoundID GetReplacementSound(FSoundID soundNum) return soundNum; } -//========================================================================== -// -// -// -//========================================================================== - -std::vector DukeSoundEngine::ReadSound(int lumpnum) -{ - auto wlump = fileSystem.OpenFileReader(lumpnum); - return wlump.Read(); -} - //========================================================================== // // diff --git a/source/games/exhumed/src/sound.cpp b/source/games/exhumed/src/sound.cpp index 9dc0cd68b..7adb28d5a 100644 --- a/source/games/exhumed/src/sound.cpp +++ b/source/games/exhumed/src/sound.cpp @@ -137,7 +137,6 @@ class EXSoundEngine : public RazeSoundEngine { // client specific parts of the sound engine go in this class. void CalcPosVel(int type, const void* source, const float pt[3], int channum, int chanflags, FSoundID chanSound, FVector3* pos, FVector3* vel, FSoundChan* chan) override; - std::vector ReadSound(int lumpnum) override; public: EXSoundEngine() @@ -159,19 +158,6 @@ public: }; -//========================================================================== -// -// -// -//========================================================================== - -std::vector EXSoundEngine::ReadSound(int lumpnum) -{ - auto wlump = fileSystem.OpenFileReader(lumpnum); - return wlump.Read(); -} - - //========================================================================== // // diff --git a/source/games/sw/src/sounds.cpp b/source/games/sw/src/sounds.cpp index aee5c59fb..b7409e7c1 100644 --- a/source/games/sw/src/sounds.cpp +++ b/source/games/sw/src/sounds.cpp @@ -363,7 +363,6 @@ class SWSoundEngine : public RazeSoundEngine { // client specific parts of the sound engine go in this class. void CalcPosVel(int type, const void* source, const float pt[3], int channum, int chanflags, FSoundID chanSound, FVector3* pos, FVector3* vel, FSoundChan* chan) override; - std::vector ReadSound(int lumpnum) override; public: SWSoundEngine()