aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/Audio/SoundEngine.h
diff options
context:
space:
mode:
authorLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
committerLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
commit087b7e7abfe81dd7f0fdcdea36ac9f245950df1a (patch)
tree69454763e73ca764af4e682d3573080b13138a0e /Minecraft.Client/Common/Audio/SoundEngine.h
parenta9be52c41a02d207233199e98898fe7483d7e817 (diff)
Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore functionality of the nightly. All in-game menus do not work and generating a world crashes. This reverts commit a9be52c41a02d207233199e98898fe7483d7e817.
Diffstat (limited to 'Minecraft.Client/Common/Audio/SoundEngine.h')
-rw-r--r--Minecraft.Client/Common/Audio/SoundEngine.h31
1 files changed, 15 insertions, 16 deletions
diff --git a/Minecraft.Client/Common/Audio/SoundEngine.h b/Minecraft.Client/Common/Audio/SoundEngine.h
index 2134c491..5417dcec 100644
--- a/Minecraft.Client/Common/Audio/SoundEngine.h
+++ b/Minecraft.Client/Common/Audio/SoundEngine.h
@@ -108,23 +108,23 @@ class SoundEngine : public ConsoleSoundEngine
static const int MAX_SAME_SOUNDS_PLAYING = 8; // 4J added
public:
SoundEngine();
- void destroy() override;
+ virtual void destroy();
#ifdef _DEBUG
void GetSoundName(char *szSoundName,int iSound);
#endif
- void play(int iSound, float x, float y, float z, float volume, float pitch) override;
- void playStreaming(const wstring& name, float x, float y , float z, float volume, float pitch, bool bMusicDelay=true) override;
- void playUI(int iSound, float volume, float pitch) override;
- void playMusicTick() override;
- void updateMusicVolume(float fVal) override;
- void updateSystemMusicPlaying(bool isPlaying) override;
- void updateSoundEffectVolume(float fVal) override;
- void init(Options *) override;
- void tick(shared_ptr<Mob> *players, float a) override; // 4J - updated to take array of local players rather than single one
- void add(const wstring& name, File *file) override;
- void addMusic(const wstring& name, File *file) override;
- void addStreaming(const wstring& name, File *file) override;
- char *ConvertSoundPathToName(const wstring& name, bool bConvertSpaces=false) override;
+ virtual void play(int iSound, float x, float y, float z, float volume, float pitch);
+ virtual void playStreaming(const wstring& name, float x, float y , float z, float volume, float pitch, bool bMusicDelay=true);
+ virtual void playUI(int iSound, float volume, float pitch);
+ virtual void playMusicTick();
+ virtual void updateMusicVolume(float fVal);
+ virtual void updateSystemMusicPlaying(bool isPlaying);
+ virtual void updateSoundEffectVolume(float fVal);
+ virtual void init(Options *);
+ virtual void tick(shared_ptr<Mob> *players, float a); // 4J - updated to take array of local players rather than single one
+ virtual void add(const wstring& name, File *file);
+ virtual void addMusic(const wstring& name, File *file);
+ virtual void addStreaming(const wstring& name, File *file);
+ virtual char *ConvertSoundPathToName(const wstring& name, bool bConvertSpaces=false);
bool isStreamingWavebankReady(); // 4J Added
int getMusicID(int iDomain);
int getMusicID(const wstring& name);
@@ -138,8 +138,7 @@ private:
#ifdef __PS3__
int initAudioHardware(int iMinSpeakers);
#else
- int initAudioHardware(int iMinSpeakers) override
- { return iMinSpeakers;}
+ int initAudioHardware(int iMinSpeakers) { return iMinSpeakers;}
#endif
int GetRandomishTrack(int iStart,int iEnd);