BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #71 from teamfisk/Warnings-Adam

Browse Source 
Warnings adam
This commit is contained in:
Simon Holmberg
2016-02-01 17:52:18 +01:00
parent ca8b7cbee8 5474a18753
commit 9b2a4be707
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1
View File
@@ -16,6 +16,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
elseif(MSVC) elseif(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
endif() endif()
#set(BUILD_SHARED_LIBS FALSE) #set(BUILD_SHARED_LIBS FALSE)
src/Engine/Sound/SoundSystem.cpp
+5 -1
View File
@@ -116,7 +116,11 @@ void SoundSystem::updateEmitters(double dt)
setSourcePos(it->second->ALsource, nextPos); setSourcePos(it->second->ALsource, nextPos);
setSourceVel(it->second->ALsource, velocity); setSourceVel(it->second->ALsource, velocity);
float gain; float gain;
(bool)(it->second->Type) ? gain = m_SFXVolumeChannel : gain = m_BGMVolumeChannel; if (it->second->Type == SoundType::SFX) {
gain = m_SFXVolumeChannel;
} else if (it->second->Type == SoundType::BGM) {
gain = m_BGMVolumeChannel;
}
auto emitter = m_World->GetComponent(it->first, "SoundEmitter"); auto emitter = m_World->GetComponent(it->first, "SoundEmitter");
setSoundProperties(it->second->ALsource, &emitter); setSoundProperties(it->second->ALsource, &emitter);