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

- fixed some warnings

Browse source
This commit is contained in:
Christoph Oelckers 2020-02-12 00:43:21 +01:00
parent 9fdd1d9e17
commit 9f9e59e3ba
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/CMakeLists.txt
View file

@ -410,7 +410,7 @@ endif()
if( MSVC ) if( MSVC )
find_package( ZMusic ) find_package( ZMusic )
else() else()
find_package( ZMusic REQUIRED ) find_package( ZMusic )
endif() endif()
if( MSVC AND NOT ZMUSIC_FOUND ) if( MSVC AND NOT ZMUSIC_FOUND )

3
source/common/music/music.cpp
View file

@ -108,11 +108,12 @@ static FName knownMusicExts[] = {
FString G_SetupFilenameBasedMusic(const char* fn, const char* defmusic) FString G_SetupFilenameBasedMusic(const char* fn, const char* defmusic)
{ {
FString name = StripExtension(fn); FString name = StripExtension(fn);
FString test;
// Test if a real file with this name exists with all known extensions for music. // Test if a real file with this name exists with all known extensions for music.
for (auto& ext : knownMusicExts) for (auto& ext : knownMusicExts)
{ {
FStringf test("%s.%s", name.GetChars(), ext.GetChars()); test.Format("%s.%s", name.GetChars(), ext.GetChars());
if (FileExists(test)) return test; if (FileExists(test)) return test;
#ifdef __unix__ #ifdef __unix__
test.Format("%s.%s", name.GetChars(), FString(ext.GetChars()).MakeLower().GetChars()); test.Format("%s.%s", name.GetChars(), FString(ext.GetChars()).MakeLower().GetChars());

2
source/common/rendering/gl/system/gl_framebuffer.h
View file

@ -26,7 +26,7 @@ public:
void CleanForRestart() override; void CleanForRestart() override;
const char* DeviceName() const override; const char* DeviceName() const override;
void WriteSavePic(FileWriter* file, int width, int height); void WriteSavePic(FileWriter* file, int width, int height) override;
#ifdef IMPLEMENT_IT #ifdef IMPLEMENT_IT
void SetTextureFilterMode() override; void SetTextureFilterMode() override;
IHardwareTexture *CreateHardwareTexture() override; IHardwareTexture *CreateHardwareTexture() override;