From 29d16868c99b7bb41ee2c77045840b511546b5f9 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 11 Nov 2019 17:51:30 +0100 Subject: [PATCH] - fixed compile errors. --- source/common/console/c_cvars.h | 1 + source/common/music/i_music.cpp | 2 +- source/common/music/i_soundfont.cpp | 1 + source/duke3d/src/sounds.cpp | 2 +- source/rr/src/sounds.cpp | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/source/common/console/c_cvars.h b/source/common/console/c_cvars.h index 4663a7ac3..56c3131fa 100644 --- a/source/common/console/c_cvars.h +++ b/source/common/console/c_cvars.h @@ -174,6 +174,7 @@ protected: FString SafeValue; FString Description; uint32_t Flags; + bool inCallback = false; private: FBaseCVar (const FBaseCVar &var) = delete; diff --git a/source/common/music/i_music.cpp b/source/common/music/i_music.cpp index 70ea6edc3..42a07bf58 100644 --- a/source/common/music/i_music.cpp +++ b/source/common/music/i_music.cpp @@ -64,7 +64,7 @@ void S_SetStreamVolume(float); EXTERN_CVAR (Int, snd_samplerate) EXTERN_CVAR (Int, snd_mididevice) -int nomusic = 0; +float relative_volume = 1.f, saved_relative_volume = 1.f; #ifdef _WIN32 diff --git a/source/common/music/i_soundfont.cpp b/source/common/music/i_soundfont.cpp index 3523e9824..666c07544 100644 --- a/source/common/music/i_soundfont.cpp +++ b/source/common/music/i_soundfont.cpp @@ -40,6 +40,7 @@ #include "filereadermusicinterface.h" #include "zmusic/zmusic.h" #include "resourcefile.h" +#include "../platform/win32/i_findfile.h" // This is a temporary direct path. Needs to be fixed when stuff gets cleaned up. //========================================================================== // diff --git a/source/duke3d/src/sounds.cpp b/source/duke3d/src/sounds.cpp index 55245b2e5..fb5e7c0b8 100644 --- a/source/duke3d/src/sounds.cpp +++ b/source/duke3d/src/sounds.cpp @@ -329,7 +329,7 @@ static int S_PlayMusic(const char* fn, bool looping = true) return 0; Mus_Play(fn, looping); - + return 1; } void S_StopMusic(void) diff --git a/source/rr/src/sounds.cpp b/source/rr/src/sounds.cpp index abba6c51b..8bad79e1a 100644 --- a/source/rr/src/sounds.cpp +++ b/source/rr/src/sounds.cpp @@ -294,7 +294,7 @@ static int S_PlayMusic(const char* fn, bool looping) return 0; Mus_Play(fn, looping); - + return 1; } void S_StopMusic(void)