zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed compile errors.

Browse source
This commit is contained in:
Christoph Oelckers 2019-11-11 17:51:30 +01:00
parent f6a9bb770d
commit 29d16868c9
5 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/common/console/c_cvars.h
View file

@ -174,6 +174,7 @@ protected:
FString SafeValue; FString SafeValue;
FString Description; FString Description;
uint32_t Flags; uint32_t Flags;
bool inCallback = false;
private: private:
FBaseCVar (const FBaseCVar &var) = delete; FBaseCVar (const FBaseCVar &var) = delete;

2
source/common/music/i_music.cpp
View file

@ -64,7 +64,7 @@ void S_SetStreamVolume(float);
EXTERN_CVAR (Int, snd_samplerate) EXTERN_CVAR (Int, snd_samplerate)
EXTERN_CVAR (Int, snd_mididevice) EXTERN_CVAR (Int, snd_mididevice)
int nomusic = 0; float relative_volume = 1.f, saved_relative_volume = 1.f;
#ifdef _WIN32 #ifdef _WIN32

1
source/common/music/i_soundfont.cpp
View file

@ -40,6 +40,7 @@
#include "filereadermusicinterface.h" #include "filereadermusicinterface.h"
#include "zmusic/zmusic.h" #include "zmusic/zmusic.h"
#include "resourcefile.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.
//========================================================================== //==========================================================================
// //

2
source/duke3d/src/sounds.cpp
View file

@ -329,7 +329,7 @@ static int S_PlayMusic(const char* fn, bool looping = true)
return 0; return 0;
Mus_Play(fn, looping); Mus_Play(fn, looping);
return 1;
} }
void S_StopMusic(void) void S_StopMusic(void)

2
source/rr/src/sounds.cpp
View file

@ -294,7 +294,7 @@ static int S_PlayMusic(const char* fn, bool looping)
return 0; return 0;
Mus_Play(fn, looping); Mus_Play(fn, looping);
return 1;
} }
void S_StopMusic(void) void S_StopMusic(void)