ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MSVC 2015 build

Browse Source
This commit is contained in:
Benau 2022-03-12 16:43:32 +08:00
parent 9fb568eaa7
commit 4a93bea962
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/graphics_engine/src/ge_vulkan_driver.cpp
View File

@ -3,6 +3,7 @@
#ifdef _IRR_COMPILE_WITH_VULKAN_ #ifdef _IRR_COMPILE_WITH_VULKAN_
const unsigned int MAX_FRAMES_IN_FLIGHT = 2; const unsigned int MAX_FRAMES_IN_FLIGHT = 2;
#include "SDL_vulkan.h" #include "SDL_vulkan.h"
#include <algorithm>
#include <limits> #include <limits>
#include <set> #include <set>
#include <sstream> #include <sstream>

16
src/audio/music_manager.cpp
View File

@ -164,7 +164,7 @@ void MusicManager::addMusicToTracks()
*/ */
void MusicManager::startMusic() void MusicManager::startMusic()
{ {
if (m_current_music && UserConfigParams::m_music) if (m_current_music.load() != NULL && UserConfigParams::m_music)
SFXManager::get()->queue(SFXManager::SFX_MUSIC_START, m_current_music); SFXManager::get()->queue(SFXManager::SFX_MUSIC_START, m_current_music);
} // startMusic } // startMusic
@ -202,7 +202,7 @@ void MusicManager::startMusic(MusicInformation* mi, bool start_right_now)
*/ */
void MusicManager::stopMusic() void MusicManager::stopMusic()
{ {
if (m_current_music) if (m_current_music.load() != NULL)
SFXManager::get()->queue(SFXManager::SFX_MUSIC_STOP, m_current_music); SFXManager::get()->queue(SFXManager::SFX_MUSIC_STOP, m_current_music);
} // stopMusic } // stopMusic
@ -211,7 +211,7 @@ void MusicManager::stopMusic()
*/ */
void MusicManager::pauseMusic() void MusicManager::pauseMusic()
{ {
if (m_current_music) if (m_current_music.load() != NULL)
SFXManager::get()->queue(SFXManager::SFX_MUSIC_PAUSE, m_current_music); SFXManager::get()->queue(SFXManager::SFX_MUSIC_PAUSE, m_current_music);
} // pauseMusic } // pauseMusic
@ -220,7 +220,7 @@ void MusicManager::pauseMusic()
*/ */
void MusicManager::resumeMusic() void MusicManager::resumeMusic()
{ {
if (m_current_music) if (m_current_music.load() != NULL)
SFXManager::get()->queue(SFXManager::SFX_MUSIC_RESUME, m_current_music); SFXManager::get()->queue(SFXManager::SFX_MUSIC_RESUME, m_current_music);
} // resumeMusic } // resumeMusic
@ -229,7 +229,7 @@ void MusicManager::resumeMusic()
*/ */
void MusicManager::switchToFastMusic() void MusicManager::switchToFastMusic()
{ {
if (m_current_music) if (m_current_music.load() != NULL)
SFXManager::get()->queue(SFXManager::SFX_MUSIC_SWITCH_FAST, SFXManager::get()->queue(SFXManager::SFX_MUSIC_SWITCH_FAST,
m_current_music); m_current_music);
} // switchToFastMusic } // switchToFastMusic
@ -241,7 +241,7 @@ void MusicManager::switchToFastMusic()
*/ */
void MusicManager::setTemporaryVolume(float gain) void MusicManager::setTemporaryVolume(float gain)
{ {
if (m_current_music) if (m_current_music.load() != NULL)
SFXManager::get()->queue(SFXManager::SFX_MUSIC_SET_TMP_VOLUME, SFXManager::get()->queue(SFXManager::SFX_MUSIC_SET_TMP_VOLUME,
m_current_music, gain); m_current_music, gain);
} // setTemporaryVolume } // setTemporaryVolume
@ -251,7 +251,7 @@ void MusicManager::setTemporaryVolume(float gain)
*/ */
void MusicManager::resetTemporaryVolume() void MusicManager::resetTemporaryVolume()
{ {
if (m_current_music) if (m_current_music.load() != NULL)
SFXManager::get()->queue(SFXManager::SFX_MUSIC_DEFAULT_VOLUME, SFXManager::get()->queue(SFXManager::SFX_MUSIC_DEFAULT_VOLUME,
m_current_music); m_current_music);
} // resetTemporaryVolume } // resetTemporaryVolume
@ -268,7 +268,7 @@ void MusicManager::setMasterMusicVolume(float gain)
gain = 0.0f; gain = 0.0f;
m_master_gain = gain; m_master_gain = gain;
if (m_current_music) if (m_current_music.load() != NULL)
{ {
// Sets the music volume to m_master_gain // Sets the music volume to m_master_gain
SFXManager::get()->queue(SFXManager::SFX_MUSIC_DEFAULT_VOLUME, SFXManager::get()->queue(SFXManager::SFX_MUSIC_DEFAULT_VOLUME,