- fixed compile errors.

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;

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
 

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.
 
 //==========================================================================
 //

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)

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)